diff --git a/dist/setup/index.js b/dist/setup/index.js index 0c355c66..0bad9693 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -100156,7 +100156,7 @@ class BaseDistribution { } getMirrorUrlVersions() { return __awaiter(this, void 0, void 0, function* () { - const initialUrl = this.getDistributionMirrorUrl(); + const initialUrl = this.getDistributionUrl(); const dataUrl = `${initialUrl}/index.json`; const response = yield this.httpClient.getJson(dataUrl); return response.result || []; @@ -100173,7 +100173,7 @@ class BaseDistribution { ? `${fileName}.zip` : `${fileName}.7z` : `${fileName}.tar.gz`; - const initialUrl = this.getDistributionMirrorUrl(); + const initialUrl = this.getDistributionUrl(); const url = `${initialUrl}/v${version}/${urlFileName}`; return { downloadUrl: url, @@ -100647,12 +100647,11 @@ class OfficialBuilds extends base_distribution_1.default { return version; } getDistributionUrl() { + if (this.nodeInfo.mirrorURL) { + return this.nodeInfo.mirrorURL; + } return `https://nodejs.org/dist`; } - getDistributionMirrorUrl() { - const mirrorURL = this.nodeInfo.mirrorURL; - return mirrorURL !== null && mirrorURL !== void 0 ? mirrorURL : ''; - } getManifest() { core.debug('Getting manifest from actions/node-versions@main'); return tc.getManifestFromRepo('actions', 'node-versions', this.nodeInfo.auth, 'main'); diff --git a/src/distributions/base-distribution.ts b/src/distributions/base-distribution.ts index 185cba3c..cc35ad7f 100644 --- a/src/distributions/base-distribution.ts +++ b/src/distributions/base-distribution.ts @@ -25,7 +25,6 @@ export default abstract class BaseDistribution { } protected abstract getDistributionUrl(): string; - protected abstract getDistributionMirrorUrl(): string; public async setupNodeJs() { let nodeJsVersions: INodeVersion[] | undefined; @@ -106,7 +105,7 @@ export default abstract class BaseDistribution { } protected async getMirrorUrlVersions(): Promise { - const initialUrl = this.getDistributionMirrorUrl(); + const initialUrl = this.getDistributionUrl(); const dataUrl = `${initialUrl}/index.json`; @@ -127,7 +126,7 @@ export default abstract class BaseDistribution { ? `${fileName}.zip` : `${fileName}.7z` : `${fileName}.tar.gz`; - const initialUrl = this.getDistributionMirrorUrl(); + const initialUrl = this.getDistributionUrl(); const url = `${initialUrl}/v${version}/${urlFileName}`; return { diff --git a/src/distributions/official_builds/official_builds.ts b/src/distributions/official_builds/official_builds.ts index 596833ff..bca6da2e 100644 --- a/src/distributions/official_builds/official_builds.ts +++ b/src/distributions/official_builds/official_builds.ts @@ -193,14 +193,12 @@ export default class OfficialBuilds extends BaseDistribution { } protected getDistributionUrl(): string { + if (this.nodeInfo.mirrorURL) { + return this.nodeInfo.mirrorURL; + } return `https://nodejs.org/dist`; } - - protected getDistributionMirrorUrl(): string { - const mirrorURL = this.nodeInfo.mirrorURL; - - return mirrorURL ?? ''; - } + private getManifest(): Promise { core.debug('Getting manifest from actions/node-versions@main');