use .python-version to compute hashkey

eifinger · Dec 21, 2023 · 4637d11 · 4637d11
1 parent 5b24b10
commit 4637d11
Show file tree

Hide file tree

Showing 5 changed files with 17 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
@@ -3,13 +3,15 @@ import * as glob from '@actions/glob'
 import * as core from '@actions/core'
 
 import {getLinuxInfo} from './utils'
+import {promises as fs} from 'fs'
 
 export const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key'
 export const CACHE_MATCHED_KEY = 'cache-matched-key'
 const CACHE_DEPENDENCY_PATH = 'requirements**.lock'
 const workingDir = `/${core.getInput('working-directory')}` || ''
 const cachePath = `${process.env['GITHUB_WORKSPACE']}${workingDir}/.venv`
 const cacheDependencyPath = `${process.env['GITHUB_WORKSPACE']}${workingDir}/${CACHE_DEPENDENCY_PATH}`
+const pythonVersionFilePath = `${process.env['GITHUB_WORKSPACE']}${workingDir}/.python-version`
 
 export async function restoreCache(
   cachePrefix: string,
@@ -46,8 +48,9 @@ async function computeKeys(
   let primaryKey = ''
   let restoreKey = ''
   const osInfo = await getLinuxInfo()
-  primaryKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}-${workingDir}-${hash}`
-  restoreKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}-${workingDir}`
+  const pyVersion = await fs.readFile(pythonVersionFilePath, 'utf8')
+  primaryKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}-${workingDir}-${pyVersion}-${hash}`
+  restoreKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}-${workingDir}-${pyVersion}`
   return {primaryKey, restoreKey}
 }