From 244f44ebd669fbd85739393f1c937598dce66c17 Mon Sep 17 00:00:00 2001 From: Matthew Lugg Date: Tue, 25 Nov 2025 15:53:08 +0000 Subject: [PATCH] Fix missing extension in temporary tarball path For some reason, this was breaking archive extraction on Windows only on Forgejo Actions (not GitHub Actions). --- common.js | 5 ----- main.js | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common.js b/common.js index aa507dd..75507da 100644 --- a/common.js +++ b/common.js @@ -248,15 +248,10 @@ function parseZigString(raw) { return result; } -async function getTarballCachePath() { - return path.join(process.env['RUNNER_TEMP'], await getTarballName()); -} - module.exports = { getVersion, getTarballName, getTarballExt, getCachePrefix, getZigCachePath, - getTarballCachePath, }; diff --git a/main.js b/main.js index 7f06d55..6d9e6e1 100644 --- a/main.js +++ b/main.js @@ -85,14 +85,15 @@ async function downloadTarball(tarball_filename) { async function retrieveTarball(tarball_name, tarball_ext) { const cache_key = `setup-zig-tarball-${tarball_name}`; - const tarball_cache_path = await common.getTarballCachePath(); + const tarball_basename = `${tarball_name}${tarball_ext}`; + const tarball_cache_path = path.join(process.env['RUNNER_TEMP'], tarball_basename); if (await cache.restoreCache([tarball_cache_path], cache_key)) { return tarball_cache_path; } core.info(`Cache miss. Fetching Zig ${await common.getVersion()}`); - const downloaded_path = await downloadTarball(`${tarball_name}${tarball_ext}`); + const downloaded_path = await downloadTarball(tarball_basename); await fs.copyFile(downloaded_path, tarball_cache_path) await cache.saveCache([tarball_cache_path], cache_key); return tarball_cache_path;