Automatically create download dir

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

Hide file tree

Showing 3 changed files with 22 additions and 18 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
@@ -1,7 +1,7 @@
 import * as core from '@actions/core'
 import * as tc from '@actions/tool-cache'
-import * as path from 'path'
 import * as exec from '@actions/exec'
+import * as path from 'path'
 import {Architecture, Platform} from '../utils/platforms'
 import {validateChecksum} from './checksum/checksum'
 import {OWNER, REPO, TOOL_CACHE_NAME} from '../utils/utils'
@@ -21,10 +21,9 @@ export async function downloadLatest(
   }
   core.info(`Downloading uv from "${downloadUrl}" ...`)
 
-  const downloadDir = `${process.cwd()}${path.sep}uv`
   const downloadPath = await tc.downloadTool(
     downloadUrl,
-    downloadDir,
+    undefined,
     githubToken
   )
   let uvExecutablePath: string
@@ -37,7 +36,7 @@ export async function downloadLatest(
     uvExecutablePath = path.join(extracted, 'uv')
   }
   const version = await getVersion(uvExecutablePath)
-  await validateChecksum(checkSum, downloadPath, arch, platform, version)
+  await validateChecksum(checkSum, extracted, arch, platform, version)
   const cachedToolDir = await tc.cacheDir(
     downloadPath,
     TOOL_CACHE_NAME,

diff --git a/src/download/download-version.ts b/src/download/download-version.ts
@@ -1,7 +1,7 @@
 import * as core from '@actions/core'
 import * as tc from '@actions/tool-cache'
-import {OWNER, REPO, TOOL_CACHE_NAME} from '../utils/utils'
 import path from 'path'
+import {OWNER, REPO, TOOL_CACHE_NAME} from '../utils/utils'
 import {Architecture, Platform} from '../utils/platforms'
 import {validateChecksum} from './checksum/checksum'
 
@@ -31,18 +31,18 @@ export async function downloadVersion(
   }
   core.info(`Downloading uv from "${downloadUrl}" ...`)
 
-  const downloadDir = `${process.cwd()}${path.sep}uv`
   const downloadPath = await tc.downloadTool(
     downloadUrl,
-    downloadDir,
+    undefined,
     githubToken
   )
   await validateChecksum(checkSum, downloadPath, arch, platform, version)
 
+  let extractedDir: string
   if (platform === 'pc-windows-msvc') {
-    await tc.extractZip(downloadPath)
+    extractedDir = await tc.extractZip(downloadPath)
   } else {
-    tc.extractTar(downloadPath)
+    extractedDir = await tc.extractTar(downloadPath)
   }
-  return await tc.cacheDir(downloadPath, TOOL_CACHE_NAME, version, arch)
+  return await tc.cacheDir(extractedDir, TOOL_CACHE_NAME, version, arch)
 }