From a42c51f185a0c3970ee7bbcbd7593f4769e06064 Mon Sep 17 00:00:00 2001
From: Andrew Krieger <akrieger@users.noreply.github.com>
Date: Sat, 12 Mar 2022 21:46:13 -0800
Subject: [PATCH] Rev vcpkg cachekeys again. Something changed and the cache
 we've kept around forever isn't hitting right again.

---
 .github/workflows/msvc-full-features.yml | 2 +-
 .github/workflows/object_creator.yml     | 2 +-
 .github/workflows/release.yml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
index c2ced9c2d00ca..794c1d66769d1 100644
--- a/.github/workflows/msvc-full-features.yml
+++ b/.github/workflows/msvc-full-features.yml
@@ -67,7 +67,7 @@ jobs:
       with:
         # run-vcpkg tries to hash vcpkg.json but complans if it finds more than one.
         # That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same.
-        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-x64
+        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-x64-1
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
         # We have to use at least this version of vcpkg to include fixes for yasm-tool's
         # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
diff --git a/.github/workflows/object_creator.yml b/.github/workflows/object_creator.yml
index 19acc0f2af62c..391be3b836eb6 100644
--- a/.github/workflows/object_creator.yml
+++ b/.github/workflows/object_creator.yml
@@ -66,7 +66,7 @@ jobs:
       with:
         # run-vcpkg tries to hash vcpkg.json but complans if it finds more than one.
         # That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same.
-        appendedCacheKey: ${{ hashFiles( '$msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json',  '.github/vcpkg_triplets/**' ) }}-x64
+        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json',  '.github/vcpkg_triplets/**' ) }}-x64-1
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
         # We have to use at least this version of vcpkg to include fixes for yasm-tool's
         # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fd5133d6483fd..8db75ad262fd4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -165,7 +165,7 @@ jobs:
         uses: lukka/run-vcpkg@v10
         id: runvcpkg
         with:
-          appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-2
+          appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
           # We have to use at least this version of vcpkg to include fixes for yasm-tool's
           # availability only as an x86 host tool. Keep it in sync with the builtin-baseline