Avoid duplicate rye bootstrap

eifinger · Feb 7, 2024 · 1d41269 · 1d41269
1 parent d9927b7
commit 1d41269
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
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/setup-rye.ts b/src/setup-rye.ts
@@ -172,18 +172,17 @@ async function installRye(
   const tempDir = path.join(process.env['RUNNER_TEMP'] || '', 'rye_temp_home')
   await io.mkdirP(tempDir)
   core.debug(`Created temporary directory ${tempDir}`)
+  const cachedPath = await tc.cacheDir(tempDir, 'rye', version, arch)
   const options: exec.ExecOptions = {
     cwd: tempDir,
     env: {
       ...process.env,
-      RYE_HOME: tempDir
+      RYE_HOME: cachedPath
     }
   }
-  core.info(`Installing Rye into ${tempDir}`)
+  core.info(`Installing Rye into ${cachedPath}`)
   await exec.exec(downloadPath, ['self', 'install', '--yes'], options)
 
-  const cachedPath = await tc.cacheDir(tempDir, 'rye', version, arch)
-  core.info(`Moved Rye into ${cachedPath}`)
   return cachedPath
 }