Merge pull request #259 from openziti/more-robust-ci-caching

use vpckg binary caching

.github/workflows/cmake.yml

@@ -11,6 +11,12 @@ jobs:
   build:
     name: ${{ matrix.target }}-${{ matrix.tls }}
     runs-on: ${{ matrix.image }}-latest
+    env:
+      CI_CACHE: '${{ github.workspace }}/.ci.cache'
+      VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/.ci.cache,readwrite'
+      VCPKG_DEFAULT_TRIPLET: ${{ matrix.target }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -40,9 +46,9 @@ jobs:
     steps:
     - name: Install tools
       if: matrix.image == 'ubuntu'
-      run: |
-        sudo apt update
-        sudo apt install -y valgrind softhsm2
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: valgrind softhsm2
 
     - name: Install tools
       if: matrix.image == 'macOS'
@@ -59,21 +65,26 @@ jobs:
 
     - uses: lukka/get-cmake@latest
 
+    - name: create cache dir
+      shell: bash
+      run: |
+        mkdir -p ${CI_CACHE}
+
     - name: Cache ${{ matrix.target }} deps
       id: cache
       uses: actions/cache@v4
       with:
-        save-always: 'true'
-        path: vcpkg/packages
-        key: dependencies-${{ matrix.target }}-${{ hashFiles('./vcpkg.json') }}
+        save-always: true
+        path: ${{ env.CI_CACHE }}
+        key: dep-${{ matrix.target }}-${{ matrix.tls }}-${{ hashFiles('./vcpkg.json') }}
+        restore-keys: |
+          dep-${{ matrix.target }}-${{ matrix.tls }}-
+          dep-${{ matrix.target }}-
 
     - uses: lukka/run-vcpkg@v11
-      env:
-        VCPKG_DEFAULT_TRIPLET: ${{ matrix.target }}
       with:
-        doNotCache: true
-        runVcpkgInstall: true
-        runVcpkgFormatString: '[`install`, `--x-install-root`, `$[env.VCPKG_INSTALLED_DIR]`, `--x-feature=all-deps`]'
+        doNotCache: false
+        runVcpkgInstall: false
 
     - uses: lukka/run-cmake@v10
       name: Configure build

.gitignore

@@ -66,6 +66,9 @@ compile_commands.json
 CTestTestfile.cmake
 build
 
+## CI cache
+.ci.cache/
+
 ### JetBrains
 .idea/
 cmake-build-*/