chore(ci): fix ci to restore the cache (denoland#18215)

wafuwafu13 · Mar 15, 2023 · 1c285ac · 1c285ac
1 parent fb021d7
commit 1c285ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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