invalidate broken cache of v1.16.1 (#190)

This will invalidate all caches because v1.16.1 does not work with old caches but fails with hard to understand errors.
eifinger · Mar 1, 2024 · 1877640 · 1877640
1 parent aad0cd7
commit 1877640
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/dist/save-cache/index.js b/dist/save-cache/index.js
diff --git a/dist/save-cache/index.js.map b/dist/save-cache/index.js.map
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/dist/setup/index.js.map b/dist/setup/index.js.map
diff --git a/src/restore-cache.ts b/src/restore-cache.ts
@@ -9,6 +9,7 @@ import {IS_MAC, getLinuxInfo, getMacOSInfo} from './utils'
 
 export const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key'
 export const STATE_CACHE_MATCHED_KEY = 'cache-matched-key'
+const CACHE_VERSION = '1'
 const CACHE_DEPENDENCY_PATH = 'requirements**.lock'
 const workingDirInput = core.getInput('working-directory')
 const workingDir = workingDirInput ? `/${workingDirInput}` : ''
@@ -56,8 +57,8 @@ async function computeKeys(
     : ''
   const osInfo = IS_MAC ? await getMacOSInfo() : await getLinuxInfo()
   const prefix = cachePrefix ? `${cachePrefix}-` : ''
-  const primaryKey = `${prefix}setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}-${dependencyPathHash}`
-  const restoreKey = `${prefix}setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}`
+  const primaryKey = `${prefix}setup-rye-${CACHE_VERSION}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}-${dependencyPathHash}`
+  const restoreKey = `${prefix}setup-rye-${CACHE_VERSION}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}`
   return {primaryKey, restoreKey}
 }