From eea6a0275e7b1bdfc79e1da2ae5bb76d75be5b17 Mon Sep 17 00:00:00 2001 From: Kevin Stillhammer Date: Wed, 18 Jun 2025 20:28:35 +0200 Subject: [PATCH] Remove redundant resolveVersion in download-version.ts --- dist/setup/index.js | 9 ++++----- src/download/download-version.ts | 15 ++++----------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 4b64975..a6880d0 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -124698,16 +124698,15 @@ function tryGetFromToolCache(arch, version) { return { version: resolvedVersion, installedPath }; } async function downloadVersion(serverUrl, platform, arch, version, checkSum, githubToken) { - const resolvedVersion = await resolveVersion(version, githubToken); const artifact = `uv-${arch}-${platform}`; let extension = ".tar.gz"; if (platform === "pc-windows-msvc") { extension = ".zip"; } - const downloadUrl = `${serverUrl}/${constants_1.OWNER}/${constants_1.REPO}/releases/download/${resolvedVersion}/${artifact}${extension}`; + const downloadUrl = `${serverUrl}/${constants_1.OWNER}/${constants_1.REPO}/releases/download/${version}/${artifact}${extension}`; core.info(`Downloading uv from "${downloadUrl}" ...`); const downloadPath = await tc.downloadTool(downloadUrl, undefined, githubToken); - await (0, checksum_1.validateChecksum)(checkSum, downloadPath, arch, platform, resolvedVersion); + await (0, checksum_1.validateChecksum)(checkSum, downloadPath, arch, platform, version); let uvDir; if (platform === "pc-windows-msvc") { const fullPathWithExtension = `${downloadPath}${extension}`; @@ -124719,8 +124718,8 @@ async function downloadVersion(serverUrl, platform, arch, version, checkSum, git const extractedDir = await tc.extractTar(downloadPath); uvDir = path.join(extractedDir, artifact); } - const cachedToolDir = await tc.cacheDir(uvDir, constants_1.TOOL_CACHE_NAME, resolvedVersion, arch); - return { version: resolvedVersion, cachedToolDir }; + const cachedToolDir = await tc.cacheDir(uvDir, constants_1.TOOL_CACHE_NAME, version, arch); + return { version: version, cachedToolDir }; } async function resolveVersion(versionInput, githubToken) { core.debug(`Resolving version: ${versionInput}`); diff --git a/src/download/download-version.ts b/src/download/download-version.ts index 894560f..4a3750c 100644 --- a/src/download/download-version.ts +++ b/src/download/download-version.ts @@ -31,13 +31,12 @@ export async function downloadVersion( checkSum: string | undefined, githubToken: string, ): Promise<{ version: string; cachedToolDir: string }> { - const resolvedVersion = await resolveVersion(version, githubToken); const artifact = `uv-${arch}-${platform}`; let extension = ".tar.gz"; if (platform === "pc-windows-msvc") { extension = ".zip"; } - const downloadUrl = `${serverUrl}/${OWNER}/${REPO}/releases/download/${resolvedVersion}/${artifact}${extension}`; + const downloadUrl = `${serverUrl}/${OWNER}/${REPO}/releases/download/${version}/${artifact}${extension}`; core.info(`Downloading uv from "${downloadUrl}" ...`); const downloadPath = await tc.downloadTool( @@ -45,13 +44,7 @@ export async function downloadVersion( undefined, githubToken, ); - await validateChecksum( - checkSum, - downloadPath, - arch, - platform, - resolvedVersion, - ); + await validateChecksum(checkSum, downloadPath, arch, platform, version); let uvDir: string; if (platform === "pc-windows-msvc") { @@ -66,10 +59,10 @@ export async function downloadVersion( const cachedToolDir = await tc.cacheDir( uvDir, TOOL_CACHE_NAME, - resolvedVersion, + version, arch, ); - return { version: resolvedVersion, cachedToolDir }; + return { version: version, cachedToolDir }; } export async function resolveVersion(