From f3381893337bb7cd0d7fef631f22adbced87fce4 Mon Sep 17 00:00:00 2001
From: Aparna Jyothi <aparnajyothi-y@github.com>
Date: Tue, 4 Mar 2025 16:31:53 +0530
Subject: [PATCH] improvements
---
__tests__/main.test.ts | 1 -
action.yml | 2 +-
dist/setup/index.js | 12 ++++--------
src/distributions/official_builds/official_builds.ts | 9 ++-------
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
index 15a777c2..5a3b0f9b 100644
--- a/__tests__/main.test.ts
+++ b/__tests__/main.test.ts
@@ -305,7 +305,6 @@ describe('main tests', () => {
// Arrange
inputs['mirror-url'] = ' ';
- // Mock log and setFailed
const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {}); // Mock the log function
// Act & Assert
diff --git a/action.yml b/action.yml
index 45cadd5f..35302813 100644
--- a/action.yml
+++ b/action.yml
@@ -17,7 +17,7 @@ inputs:
registry-url:
description: 'Optional registry to set up for auth. Will set the registry in a project level .npmrc and .yarnrc file, and set up auth to read in from env.NODE_AUTH_TOKEN.'
mirror-url:
- description: 'Custom mirror URL to download Node.js from (optional)'
+ description: 'Custom mirror URL to download Node.js'
required: false
scope:
description: 'Optional scope for authenticating against scoped registries. Will fall back to the repository owner when using the GitHub Packages registry (https://npm.pkg.github.com/).'
diff --git a/dist/setup/index.js b/dist/setup/index.js
index bf340c22..6682b6d3 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -100510,17 +100510,14 @@ class OfficialBuilds extends base_distribution_1.default {
}
setupNodeJs() {
return __awaiter(this, void 0, void 0, function* () {
- var _a, _b;
+ var _a;
if (this.nodeInfo.mirrorURL) {
- let downloadPath = '';
try {
core.info(`Attempting to download using mirror URL...`);
- downloadPath = yield this.downloadFromMirrorURL(); // Attempt to download from the mirror
+ yield this.downloadFromMirrorURL(); // Attempt to download from the mirror
}
catch (err) {
core.setFailed(err.message);
- core.setFailed('Download failed');
- core.debug((_a = err.stack) !== null && _a !== void 0 ? _a : 'empty stack');
}
}
else {
@@ -100581,7 +100578,7 @@ class OfficialBuilds extends base_distribution_1.default {
else {
core.info(err.message);
}
- core.debug((_b = err.stack) !== null && _b !== void 0 ? _b : 'empty stack');
+ core.debug((_a = err.stack) !== null && _a !== void 0 ? _a : 'empty stack');
core.info('Falling back to download directly from Node');
}
if (!toolPath) {
@@ -100719,11 +100716,10 @@ class OfficialBuilds extends base_distribution_1.default {
catch (error) {
if (error instanceof tc.HTTPError && error.httpStatusCode === 404) {
core.setFailed(`Node version ${this.nodeInfo.versionSpec} for platform ${this.osPlat} and architecture ${this.nodeInfo.arch} was found but failed to download. ` +
- 'This usually happens when downloadable binaries are not fully updated at https://nodejs.org/. ' +
+ 'This usually happens when downloadable binaries are not fully updated in the provided mirror-url' +
'To resolve this issue you may either fall back to the older version or try again later.');
}
else {
- // For any other error type, you can log the error message.
core.setFailed(`An unexpected error occurred like url might not correct`);
}
throw error;
diff --git a/src/distributions/official_builds/official_builds.ts b/src/distributions/official_builds/official_builds.ts
index 24db9dd4..fe35bae4 100644
--- a/src/distributions/official_builds/official_builds.ts
+++ b/src/distributions/official_builds/official_builds.ts
@@ -16,15 +16,11 @@ export default class OfficialBuilds extends BaseDistribution {
public async setupNodeJs() {
if (this.nodeInfo.mirrorURL) {
- let downloadPath = '';
-
try {
core.info(`Attempting to download using mirror URL...`);
- downloadPath = await this.downloadFromMirrorURL(); // Attempt to download from the mirror
+ await this.downloadFromMirrorURL(); // Attempt to download from the mirror
} catch (err) {
core.setFailed((err as Error).message);
- core.setFailed('Download failed');
- core.debug((err as Error).stack ?? 'empty stack');
}
} else {
core.info('Setup Node.js');
@@ -331,11 +327,10 @@ export default class OfficialBuilds extends BaseDistribution {
if (error instanceof tc.HTTPError && error.httpStatusCode === 404) {
core.setFailed(
`Node version ${this.nodeInfo.versionSpec} for platform ${this.osPlat} and architecture ${this.nodeInfo.arch} was found but failed to download. ` +
- 'This usually happens when downloadable binaries are not fully updated at https://nodejs.org/. ' +
+ 'This usually happens when downloadable binaries are not fully updated in the provided mirror-url' +
'To resolve this issue you may either fall back to the older version or try again later.'
);
} else {
- // For any other error type, you can log the error message.
core.setFailed(
`An unexpected error occurred like url might not correct`
);