Merge pull request #293 from wravery/main

Make workflows work with vcpkg binary artifact caching

Author: wravery

.github/workflows/macos.yml

@@ -20,12 +20,14 @@ jobs:
       uses: actions/cache@v3
       id: cache-vcpkg
       with:
-        path: build/vcpkg_installed/
-        key: vcpkg-x64-osx
+        path: build/vcpkg_cache/
+        key: vcpkg-binaries-x64-osx
 
     - name: Create Build Environment
       if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
-      run: cmake -E make_directory build
+      run: |
+        cmake -E make_directory build
+        cmake -E make_directory build/vcpkg_cache
 
     - name: Configure
       shell: pwsh
@@ -34,6 +36,10 @@ jobs:
         $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $cmakeBuildType = '${{ matrix.config }}'
 
+        $cachedBinaries = Join-Path $(Get-Location) './vcpkg_cache/' -Resolve
+        $cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
+        $env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
+
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}
 
     - name: Build

.github/workflows/windows.yml

@@ -27,12 +27,14 @@ jobs:
       uses: actions/cache@v3
       id: cache-vcpkg
       with:
-        path: build/vcpkg_installed/
-        key: vcpkg-${{ steps.set-variables.outputs.vcpkg_triplet }}
+        path: build/vcpkg_cache/
+        key: vcpkg-binaries-${{ steps.set-variables.outputs.vcpkg_triplet }}
 
     - name: Create Build Environment
       if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
-      run: cmake -E make_directory build
+      run: |
+        cmake -E make_directory build
+        cmake -E make_directory build/vcpkg_cache
 
     - name: Configure
       shell: pwsh
@@ -43,6 +45,10 @@ jobs:
         $cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
         $msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })
 
+        $cachedBinaries = Join-Path $(Get-Location) './vcpkg_cache/' -Resolve
+        $cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
+        $env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
+
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DVCPKG_TARGET_TRIPLET=$vcpkgTriplet" "-DBUILD_SHARED_LIBS=$cmakeSharedLibs" -G "Visual Studio 17 2022" -A "$msbuildArch" ${{ github.workspace }}
 
     - name: Build