From b53c9d55c0d5fed6ab90d14d2957e01a6fa85f3d Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Wed, 23 Oct 2024 22:03:39 -0400 Subject: [PATCH] include ImageVersion in cache key --- .github/actions/build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 88e925ab..3ecc7bbd 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -42,13 +42,13 @@ runs: - uses: actions/cache@v4 if: runner.os != 'Linux' with: - key: deps-${{ inputs.preset }}-${{ hashFiles('./vcpkg.json') }} + key: deps-${{ inputs.preset }}-${{ hashFiles('./vcpkg.json') }}-ImageVersion=${{ env.ImageVersion }} path: ./vcpkg_cache - uses: actions/cache@v4 if: runner.os == 'Linux' with: - key: deps=${{ inputs.preset }}-${{ hashFiles('./vcpkg.json', '.github/actions/openziti-tunnel-build-action/gh-release/vcpkg-overlays/**/vcpkg.json') }} + key: deps-${{ inputs.preset }}-${{ hashFiles('./vcpkg.json', '.github/actions/openziti-tunnel-build-action/gh-release/vcpkg-overlays/**/vcpkg.json') }}-ImageVersion=${{ env.ImageVersion }} path: ./vcpkg_cache - uses: lukka/run-cmake@v10.6 # pin version to avoid failed glibc dependency on ubuntu 20 runners. go back to @latest when ubuntu 22+ is adopted for runner os.