From 67efd41074bde9804bc497da524a1e7d1626b4db Mon Sep 17 00:00:00 2001 From: Kevin Stillhammer Date: Sat, 24 Aug 2024 00:14:50 +0200 Subject: [PATCH] Cache in tool cache --- dist/setup/index.js | 25 +++++++++++++------------ src/download/download-latest.ts | 12 +++++++++--- src/download/download-version.ts | 2 +- src/setup-uv.ts | 23 ++++++++++++----------- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 8ac8c6a..b30598c 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -85423,7 +85423,8 @@ function downloadLatest(platform, arch, checkSum, githubToken) { } const version = yield getVersion(uvExecutablePath); yield (0, checksum_1.validateChecksum)(checkSum, downloadPath, arch, platform, version); - return { downloadDir, version }; + const cachedToolDir = yield tc.cacheDir(downloadPath, utils_1.TOOL_CACHE_NAME, version, arch); + return { cachedToolDir, version }; }); } exports.downloadLatest = downloadLatest; @@ -85525,7 +85526,7 @@ function downloadVersion(platform, arch, version, checkSum, githubToken) { else { tc.extractTar(downloadPath); } - return downloadPath; + return yield tc.cacheDir(downloadPath, utils_1.TOOL_CACHE_NAME, version, arch); }); } exports.downloadVersion = downloadVersion; @@ -85589,11 +85590,14 @@ function run() { if (arch === undefined) { throw new Error(`Unsupported architecture: ${process.arch}`); } - const installedVersion = yield setupUv(platform, arch, inputs_1.version, inputs_1.checkSum, inputs_1.githubToken); + const setupResult = yield setupUv(platform, arch, inputs_1.version, inputs_1.checkSum, inputs_1.githubToken); + addUvToPath(setupResult.uvDir); + core.setOutput('uv-version', inputs_1.version); + core.info(`Successfully installed uv version ${inputs_1.version}`); addMatchers(); setCacheDir(inputs_1.cacheLocalPath); if (inputs_1.enableCache) { - yield (0, restore_cache_1.restoreCache)(installedVersion); + yield (0, restore_cache_1.restoreCache)(setupResult.version); } } catch (err) { @@ -85605,26 +85609,23 @@ function run() { function setupUv(platform, arch, versionInput, checkSum, githubToken) { return __awaiter(this, void 0, void 0, function* () { let installedPath; - let downloadDir; + let cachedToolDir; let version; if (versionInput === 'latest') { const result = yield (0, download_latest_1.downloadLatest)(platform, arch, checkSum, githubToken); version = result.version; - downloadDir = result.downloadDir; + cachedToolDir = result.cachedToolDir; } else { version = versionInput; installedPath = (0, download_version_1.tryGetFromToolCache)(arch, versionInput); if (installedPath) { core.info(`Found uv in tool-cache for ${versionInput}`); - return version; + return { uvDir: installedPath, version }; } - downloadDir = yield (0, download_version_1.downloadVersion)(platform, arch, versionInput, checkSum, githubToken); + cachedToolDir = yield (0, download_version_1.downloadVersion)(platform, arch, versionInput, checkSum, githubToken); } - addUvToPath(downloadDir); - core.setOutput('uv-version', version); - core.info(`Successfully installed uv version ${version}`); - return version; + return { uvDir: cachedToolDir, version }; }); } function addUvToPath(cachedPath) { diff --git a/src/download/download-latest.ts b/src/download/download-latest.ts index dcfd0a5..5690f77 100644 --- 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 { diff --git a/src/download/download-version.ts b/src/download/download-version.ts index 4ef9ffd..e136e49 100644 --- 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 index 2bb4cdd..a986fc2 100644 --- a/src/setup-uv.ts +++ b/src/setup-uv.ts @@ -24,7 +24,7 @@ async function run(): Promise { if (arch === undefined) { throw new Error(`Unsupported architecture: ${process.arch}`) } - const installedVersion = await setupUv( + const setupResult = await setupUv( platform, arch, version, @@ -32,11 +32,15 @@ async function run(): Promise { 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 { +): 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 {