From 141334fcd1248aba82bae2a0682d9f5a5e06cf84 Mon Sep 17 00:00:00 2001 From: panticmilos Date: Thu, 19 May 2022 18:21:03 +0200 Subject: [PATCH] remove unnecessary dist call --- dist/setup/index.js | 11 +++++++---- src/installer.ts | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 0a513f92..4adfa5c2 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -62346,6 +62346,7 @@ function getNode(versionSpec, stable, checkLatest, auth, arch = os.arch()) { let manifest; let osPlat = os.platform(); let osArch = translateArchToDistUrl(arch); + let latestVersionResolved = false; if (isLtsAlias(versionSpec)) { core.info('Attempt to resolve LTS alias from manifest...'); // No try-catch since it's not possible to resolve LTS alias without manifest @@ -62365,6 +62366,7 @@ function getNode(versionSpec, stable, checkLatest, auth, arch = os.arch()) { } if (isLatestSyntax(versionSpec)) { versionSpec = yield queryDistForMatch(versionSpec, arch); + latestVersionResolved = true; core.info(`getting latest node version...`); } // check cache @@ -62407,7 +62409,7 @@ function getNode(versionSpec, stable, checkLatest, auth, arch = os.arch()) { // Download from nodejs.org // if (!downloadPath) { - info = yield getInfoFromDist(versionSpec, arch); + info = yield getInfoFromDist(versionSpec, arch, latestVersionResolved); if (!info) { throw new Error(`Unable to find Node version '${versionSpec}' for platform ${osPlat} and architecture ${osArch}.`); } @@ -62507,12 +62509,13 @@ function getInfoFromManifest(versionSpec, stable, auth, osArch = translateArchTo return info; }); } -function getInfoFromDist(versionSpec, arch = os.arch()) { +function getInfoFromDist(versionSpec, arch = os.arch(), latestVersionResolved) { return __awaiter(this, void 0, void 0, function* () { let osPlat = os.platform(); let osArch = translateArchToDistUrl(arch); - let version; - version = yield queryDistForMatch(versionSpec, arch); + let version = latestVersionResolved + ? versionSpec + : yield queryDistForMatch(versionSpec, arch); if (!version) { return null; } diff --git a/src/installer.ts b/src/installer.ts index 4f7603ae..cfd69458 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -40,6 +40,7 @@ export async function getNode( let manifest: INodeRelease[] | undefined; let osPlat: string = os.platform(); let osArch: string = translateArchToDistUrl(arch); + let latestVersionResolved: boolean = false; if (isLtsAlias(versionSpec)) { core.info('Attempt to resolve LTS alias from manifest...'); @@ -69,6 +70,7 @@ export async function getNode( if (isLatestSyntax(versionSpec)) { versionSpec = await queryDistForMatch(versionSpec, arch); + latestVersionResolved = true; core.info(`getting latest node version...`); } @@ -125,7 +127,7 @@ export async function getNode( // Download from nodejs.org // if (!downloadPath) { - info = await getInfoFromDist(versionSpec, arch); + info = await getInfoFromDist(versionSpec, arch, latestVersionResolved); if (!info) { throw new Error( `Unable to find Node version '${versionSpec}' for platform ${osPlat} and architecture ${osArch}.` @@ -271,14 +273,16 @@ async function getInfoFromManifest( async function getInfoFromDist( versionSpec: string, - arch: string = os.arch() + arch: string = os.arch(), + latestVersionResolved?: boolean ): Promise { let osPlat: string = os.platform(); let osArch: string = translateArchToDistUrl(arch); - let version: string; + let version: string = latestVersionResolved + ? versionSpec + : await queryDistForMatch(versionSpec, arch); - version = await queryDistForMatch(versionSpec, arch); if (!version) { return null; }