Cache in tool cache

astral-sh · Aug 23, 2024 · 67efd41 · 67efd41
1 parent dccd08d
commit 67efd41
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/src/download/download-latest.ts b/src/download/download-latest.ts
@@ -4,14 +4,14 @@ import * as path from 'path'
 import * as exec from '@actions/exec'
 import {Architecture, Platform} from '../utils/platforms'
 import {validateChecksum} from './checksum/checksum'
-import {OWNER, REPO} from '../utils/utils'
+import {OWNER, REPO, TOOL_CACHE_NAME} from '../utils/utils'
 
 export async function downloadLatest(
   platform: Platform,
   arch: Architecture,
   checkSum: string | undefined,
   githubToken: string | undefined
-): Promise<{downloadDir: string; version: string}> {
+): Promise<{cachedToolDir: string; version: string}> {
   const binary = `uv-${arch}-${platform}`
   let downloadUrl = `https://github.com/${OWNER}/${REPO}/releases/latest/download/${binary}`
   if (platform === 'pc-windows-msvc') {
@@ -38,8 +38,14 @@ export async function downloadLatest(
   }
   const version = await getVersion(uvExecutablePath)
   await validateChecksum(checkSum, downloadPath, arch, platform, version)
+  const cachedToolDir = await tc.cacheDir(
+    downloadPath,
+    TOOL_CACHE_NAME,
+    version,
+    arch
+  )
 
-  return {downloadDir, version}
+  return {cachedToolDir, version}
 }
 
 async function getVersion(uvExecutablePath: string): Promise<string> {

diff --git a/src/download/download-version.ts b/src/download/download-version.ts
@@ -44,5 +44,5 @@ export async function downloadVersion(
   } else {
     tc.extractTar(downloadPath)
   }
-  return downloadPath
+  return await tc.cacheDir(downloadPath, TOOL_CACHE_NAME, version, arch)
 }
diff --git a/src/setup-uv.ts b/src/setup-uv.ts
@@ -24,19 +24,23 @@ async function run(): Promise<void> {
     if (arch === undefined) {
       throw new Error(`Unsupported architecture: ${process.arch}`)
     }
-    const installedVersion = await setupUv(
+    const setupResult = await setupUv(
       platform,
       arch,
       version,
       checkSum,
       githubToken
     )
 
+    addUvToPath(setupResult.uvDir)
+    core.setOutput('uv-version', version)
+    core.info(`Successfully installed uv version ${version}`)
+
     addMatchers()
     setCacheDir(cacheLocalPath)
 
     if (enableCache) {
-      await restoreCache(installedVersion)
+      await restoreCache(setupResult.version)
     }
   } catch (err) {
     core.setFailed((err as Error).message)
@@ -50,22 +54,22 @@ async function setupUv(
   versionInput: string,
   checkSum: string | undefined,
   githubToken: string | undefined
-): Promise<string> {
+): Promise<{uvDir: string; version: string}> {
   let installedPath: string | undefined
-  let downloadDir: string
+  let cachedToolDir: string
   let version: string
   if (versionInput === 'latest') {
     const result = await downloadLatest(platform, arch, checkSum, githubToken)
     version = result.version
-    downloadDir = result.downloadDir
+    cachedToolDir = result.cachedToolDir
   } else {
     version = versionInput
     installedPath = tryGetFromToolCache(arch, versionInput)
     if (installedPath) {
       core.info(`Found uv in tool-cache for ${versionInput}`)
-      return version
+      return {uvDir: installedPath, version}
     }
-    downloadDir = await downloadVersion(
+    cachedToolDir = await downloadVersion(
       platform,
       arch,
       versionInput,
@@ -74,10 +78,7 @@ async function setupUv(
     )
   }
 
-  addUvToPath(downloadDir)
-  core.setOutput('uv-version', version)
-  core.info(`Successfully installed uv version ${version}`)
-  return version
+  return {uvDir: cachedToolDir, version}
 }
 
 function addUvToPath(cachedPath: string): void {