From f4a67bbeca970f103397d3d2b9462cf787cd2980 Mon Sep 17 00:00:00 2001 From: Timo Sand Date: Tue, 9 Jun 2026 19:03:18 +0300 Subject: [PATCH] Only use `mirrorToken` in `getManifest` if it's provided (#1548) * Only use `mirrorToken` in `getManifest` if it's provided Signed-off-by: Timo Sand * `npm run build` Signed-off-by: Timo Sand --------- Signed-off-by: Timo Sand --- dist/setup/index.js | 8 ++++++-- src/distributions/official_builds/official_builds.ts | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 8a86b779..81cafc3e 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -79822,7 +79822,9 @@ class OfficialBuilds extends base_distribution_1.default { const versionInfo = await this.getInfoFromManifest(this.nodeInfo.versionSpec, this.nodeInfo.stable, osArch, manifest); if (versionInfo) { core.info(`Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`); - downloadPath = await tc.downloadTool(versionInfo.downloadUrl, undefined, this.nodeInfo.mirror ? this.nodeInfo.mirrorToken : this.nodeInfo.auth); + downloadPath = await tc.downloadTool(versionInfo.downloadUrl, undefined, this.nodeInfo.mirror && this.nodeInfo.mirrorToken + ? this.nodeInfo.mirrorToken + : this.nodeInfo.auth); if (downloadPath) { toolPath = await this.extractArchive(downloadPath, versionInfo, false); } @@ -79893,7 +79895,9 @@ class OfficialBuilds extends base_distribution_1.default { } getManifest() { core.debug('Getting manifest from actions/node-versions@main'); - return tc.getManifestFromRepo('actions', 'node-versions', this.nodeInfo.mirror ? this.nodeInfo.mirrorToken : this.nodeInfo.auth, 'main'); + return tc.getManifestFromRepo('actions', 'node-versions', this.nodeInfo.mirror && this.nodeInfo.mirrorToken + ? this.nodeInfo.mirrorToken + : this.nodeInfo.auth, 'main'); } resolveLtsAliasFromManifest(versionSpec, stable, manifest) { const alias = versionSpec.split('lts/')[1]?.toLowerCase(); diff --git a/src/distributions/official_builds/official_builds.ts b/src/distributions/official_builds/official_builds.ts index 14ad5612..c570333f 100644 --- a/src/distributions/official_builds/official_builds.ts +++ b/src/distributions/official_builds/official_builds.ts @@ -84,7 +84,9 @@ export default class OfficialBuilds extends BaseDistribution { downloadPath = await tc.downloadTool( versionInfo.downloadUrl, undefined, - this.nodeInfo.mirror ? this.nodeInfo.mirrorToken : this.nodeInfo.auth + this.nodeInfo.mirror && this.nodeInfo.mirrorToken + ? this.nodeInfo.mirrorToken + : this.nodeInfo.auth ); if (downloadPath) { @@ -188,7 +190,9 @@ export default class OfficialBuilds extends BaseDistribution { return tc.getManifestFromRepo( 'actions', 'node-versions', - this.nodeInfo.mirror ? this.nodeInfo.mirrorToken : this.nodeInfo.auth, + this.nodeInfo.mirror && this.nodeInfo.mirrorToken + ? this.nodeInfo.mirrorToken + : this.nodeInfo.auth, 'main' ); }