From 1c285ac214ff843a04e76fd6e9669bd8e809748c Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:03:07 -0400
Subject: [PATCH] chore(ci): fix ci to restore the cache (#18215)

---
 .github/workflows/ci.generate.ts | 9 +++++----
 .github/workflows/ci.yml         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 1d68439d69..35367adb87 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -10,6 +10,9 @@ const Runners = {
   macos: "macos-12",
   windows: `\${{ ${windowsRunnerCondition} }}`,
 };
+// bump the number at the start when you want to purge the cache
+const cacheKeyPrefix =
+  "18-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-";
 
 const installPkgsCommand =
   "sudo apt-get install --no-install-recommends debootstrap clang-15 lld-15";
@@ -442,8 +445,7 @@ const ci = {
                 "!./target/*/*.tar.gz",
               ].join("\n"),
               key: "never_saved",
-              "restore-keys":
-                "19-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-",
+              "restore-keys": cacheKeyPrefix,
             },
           },
           {
@@ -857,8 +859,7 @@ const ci = {
                 "!./target/*/*.zip",
                 "!./target/*/*.tar.gz",
               ].join("\n"),
-              key:
-                "18-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}",
+              key: cacheKeyPrefix + "${{ github.sha }}",
             },
           },
         ]),
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61a2ac6b69..fbffd8ba70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -274,7 +274,7 @@ jobs:
             !./target/*/*.zip
             !./target/*/*.tar.gz
           key: never_saved
-          restore-keys: '19-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-'
+          restore-keys: '18-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-'
       - name: Apply and update mtime cache
         if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != ''true'' && (!startsWith(github.ref, ''refs/tags/'')))'
         uses: ./.github/mtime_cache