From bef35b722a7aa993e4ba3db7f5a46879687c12dc Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sat, 28 Nov 2020 12:53:06 +0100
Subject: [PATCH] Use latest buildcache (#7050)

---
 .github/workflows/ResInsightWithCache.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml
index bd17ab0499..6b46ec21b4 100644
--- a/.github/workflows/ResInsightWithCache.yml
+++ b/.github/workflows/ResInsightWithCache.yml
@@ -10,7 +10,7 @@ on:
 env:
   NINJA_VERSION: 1.9.0
   BUILD_TYPE: Release
-  BUILDCACHE_VERSION: 0.18.0
+  BUILDCACHE_VERSION: 0.23.0
   BUILDCACHE_DIR: ${{ github.workspace }}/buildcache_dir
 
 jobs:
@@ -29,14 +29,6 @@ jobs:
             vcpkg-triplet: x64-windows,
             cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
           }
-        - {
-            name: "Ubuntu Latest GCC",
-            os: ubuntu-latest,
-            cc: "gcc", cxx: "g++",
-            vcpkg-response-file: vcpkg_x64-linux.txt,
-            vcpkg-triplet: x64-linux,
-            cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
-          }
         - {
             name: "Ubuntu 20.04",
             os: ubuntu-20.04,
@@ -75,7 +67,7 @@ jobs:
           if ("${{ runner.os }}" STREQUAL "Windows")
             set(buildcache_suffix "win-msvc.zip")
           elseif ("${{ runner.os }}" STREQUAL "Linux")
-            set(buildcache_suffix "linux.zip")
+            set(buildcache_suffix "linux.tar.gz")
           endif()
 
           set(buildcache_version $ENV{BUILDCACHE_VERSION})
@@ -85,7 +77,7 @@ jobs:
 
           if (NOT "${{ runner.os }}" STREQUAL "Windows")
             execute_process(
-              COMMAND chmod +x bin/buildcache
+              COMMAND chmod +x buildcache/bin/buildcache
             )
           endif()
           
@@ -105,7 +97,7 @@ jobs:
         run: New-Item ${{ env.BUILDCACHE_DIR }} -ItemType "directory" -Force 
         shell: pwsh
       - name: Add buildcache to system path
-        run: echo "${{github.workspace}}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
+        run: echo "${{github.workspace}}/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
         shell: pwsh
         
       - name: Cache Qt        
@@ -211,7 +203,7 @@ jobs:
           endif()
 
       - name: Stats for buildcache
-        run: ${{ github.workspace }}/bin/buildcache -s
+        run: ${{ github.workspace }}/buildcache/bin/buildcache -s
 
       - name: (Windows) Run Unit Tests
         if: contains( matrix.config.os, 'windows')