diff --git a/dist/setup/index.js b/dist/setup/index.js index 391e4d6..08107f0 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -128793,34 +128793,15 @@ class JavaBase { } else { core.info('Trying to resolve the latest version from remote'); - try { - const javaRelease = yield this.findPackageForDownload(this.version); - core.info(`Resolved latest version as ${javaRelease.version}`); - if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) { - core.info(`Resolved Java ${foundJava.version} from tool-cache`); - } - else { - core.info('Trying to download...'); - foundJava = yield this.downloadTool(javaRelease); - core.info(`Java ${foundJava.version} was downloaded`); - } + const javaRelease = yield this.findPackageForDownload(this.version); + core.info(`Resolved latest version as ${javaRelease.version}`); + if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) { + core.info(`Resolved Java ${foundJava.version} from tool-cache`); } - catch (error) { - if (error instanceof tc.HTTPError && error.httpStatusCode === 403) { - core.error(`Received HTTP 403: Permission denied or restricted access.`); - } - else if (error instanceof tc.HTTPError && - error.httpStatusCode === 429) { - core.warning(`Received HTTP 429: Rate limit exceeded. Try again later.`); - } - else { - const message = error instanceof Error ? error.message : JSON.stringify(error); - core.error(`Failed to set up Java due to a network issue or timeout: ${message}`); - } - if (error instanceof Error && error.stack) { - core.debug(error.stack); - } - throw error; + else { + core.info('Trying to download...'); + foundJava = yield this.downloadTool(javaRelease); + core.info(`Java ${foundJava.version} was downloaded`); } } // JDK folder may contain postfix "Contents/Home" on macOS diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts index 4385c9b..258ac9f 100644 --- a/src/distributions/base-installer.ts +++ b/src/distributions/base-installer.ts @@ -51,40 +51,14 @@ export abstract class JavaBase { core.info(`Resolved Java ${foundJava.version} from tool-cache`); } else { core.info('Trying to resolve the latest version from remote'); - try { - const javaRelease = await this.findPackageForDownload(this.version); - core.info(`Resolved latest version as ${javaRelease.version}`); - if (foundJava?.version === javaRelease.version) { - core.info(`Resolved Java ${foundJava.version} from tool-cache`); - } else { - core.info('Trying to download...'); - foundJava = await this.downloadTool(javaRelease); - core.info(`Java ${foundJava.version} was downloaded`); - } - } catch (error: any) { - if (error instanceof tc.HTTPError && error.httpStatusCode === 403) { - core.error( - `Received HTTP 403: Permission denied or restricted access.` - ); - } else if ( - error instanceof tc.HTTPError && - error.httpStatusCode === 429 - ) { - core.warning( - `Received HTTP 429: Rate limit exceeded. Try again later.` - ); - } else { - const message = - error instanceof Error ? error.message : JSON.stringify(error); - core.error( - `Failed to set up Java due to a network issue or timeout: ${message}` - ); - } - if (error instanceof Error && error.stack) { - core.debug(error.stack); - } - - throw error; + const javaRelease = await this.findPackageForDownload(this.version); + core.info(`Resolved latest version as ${javaRelease.version}`); + if (foundJava?.version === javaRelease.version) { + core.info(`Resolved Java ${foundJava.version} from tool-cache`); + } else { + core.info('Trying to download...'); + foundJava = await this.downloadTool(javaRelease); + core.info(`Java ${foundJava.version} was downloaded`); } }