remove leading "-" on empty cache prefix

eifinger · Feb 8, 2024 · 262ab51 · 262ab51
1 parent 6a2dae8
commit 262ab51
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
@@ -55,8 +55,9 @@ async function computeKeys(
     ? `-${crypto.createHash('sha256').update(workingDir).digest('hex')}`
     : ''
   const osInfo = await getLinuxInfo()
-  const primaryKey = `${cachePrefix}-setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}-${dependencyPathHash}`
-  const restoreKey = `${cachePrefix}-setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}`
+  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}`
   return {primaryKey, restoreKey}
 }