commit

__tests__/distributors/jetbrains-installer.test.ts

@@ -41,7 +41,9 @@ describe('getAvailableVersions', () => {
     expect(availableVersions).not.toBeNull();
 
     const length =
-      os.platform() === 'win32' ? manifestData.length : manifestData.length + 2;
+      os.platform() === 'win32'
+        ? manifestData.length - 1
+        : manifestData.length + 1;
     expect(availableVersions.length).toBe(length);
   }, 10_000);
 });

dist/setup/index.js

@@ -128806,20 +128806,16 @@ class JavaBase {
                     }
                 }
                 catch (error) {
-                    if (error instanceof tc.HTTPError) {
-                        if (error.httpStatusCode === 403) {
-                            core.error('HTTP 403: Permission denied or access restricted.');
-                        }
-                        else if (error.httpStatusCode === 429) {
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-                        }
-                        else {
-                            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+                    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(`Java setup failed due to network issue or timeout: ${message}`);
+                        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);
@@ -129695,12 +129691,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                     // url is identical except page_index so print it once for debug
                     core.debug(`Gathering available versions from '${rawUrl}'`);
                 }
-                const paginationPageResult = (yield this.http.getJson(rawUrl, requestHeaders)).result;
-                if (!paginationPageResult || paginationPageResult.length === 0) {
-                    // break infinity loop because we have reached end of pagination
-                    break;
-                }
-                const paginationPage = paginationPageResult.filter(version => this.stable ? !version.prerelease : version.prerelease);
+                const paginationPage = (yield this.http.getJson(rawUrl, requestHeaders)).result;
                 if (!paginationPage || paginationPage.length === 0) {
                     // break infinity loop because we have reached end of pagination
                     break;
@@ -129708,11 +129699,9 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                 rawVersions.push(...paginationPage);
                 page_index++;
             }
-            if (this.stable) {
             // Add versions not available from the API but are downloadable
             const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-                rawVersions.push(...hidden.map(tag => ({ tag_name: tag, name: tag, prerelease: false })));
-            }
+            rawVersions.push(...hidden.map(tag => ({ tag_name: tag, name: tag })));
             const versions0 = rawVersions.map((v) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 // Release tags look like one of these:
@@ -129731,7 +129720,7 @@ class JetBrainsDistribution extends base_installer_1.JavaBase {
                     .replace('-', '');
                 const vsplit = vstring.split('b');
                 let semver = vsplit[0];
-                const build = vsplit[1];
+                const build = +vsplit[1];
                 // Normalize semver
                 if (!semver.includes('.') && !semver.includes('_'))
                     semver = `${semver}.0.0`;

package-lock.json

@@ -32,7 +32,7 @@
         "eslint-plugin-node": "^11.1.0",
         "jest": "^29.7.0",
         "jest-circus": "^29.7.0",
-        "prettier": "^3.6.2",
+        "prettier": "^2.8.4",
         "ts-jest": "^29.3.0",
         "typescript": "^5.3.3"
       }
@@ -4719,15 +4719,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
       "bin": {
-        "prettier": "bin/prettier.cjs"
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=10.13.0"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"

package.json

@@ -49,7 +49,7 @@
     "eslint-plugin-node": "^11.1.0",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
-    "prettier": "^3.6.2",
+    "prettier": "^2.8.4",
     "ts-jest": "^29.3.0",
     "typescript": "^5.3.3"
   },

src/distributions/base-installer.ts

@@ -62,24 +62,28 @@ export abstract class JavaBase {
           core.info(`Java ${foundJava.version} was downloaded`);
         }
       } catch (error: any) {
-        if (error instanceof tc.HTTPError) {
-          if (error.httpStatusCode === 403) {
-            core.error('HTTP 403: Permission denied or access restricted.');
-          } else if (error.httpStatusCode === 429) {
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-          } else {
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-          }
+        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(
-            `Java setup failed due to network issue or timeout: ${message}`
+            `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;
       }
     }

src/distributions/jetbrains/installer.ts

@@ -113,18 +113,9 @@ export class JetBrainsDistribution extends JavaBase {
         core.debug(`Gathering available versions from '${rawUrl}'`);
       }
 
-      const paginationPageResult = (
+      const paginationPage = (
         await this.http.getJson<IJetBrainsRawVersion[]>(rawUrl, requestHeaders)
       ).result;
-      if (!paginationPageResult || paginationPageResult.length === 0) {
-        // break infinity loop because we have reached end of pagination
-        break;
-      }
-
-      const paginationPage: IJetBrainsRawVersion[] =
-        paginationPageResult.filter(version =>
-          this.stable ? !version.prerelease : version.prerelease
-        );
       if (!paginationPage || paginationPage.length === 0) {
         // break infinity loop because we have reached end of pagination
         break;
@@ -134,13 +125,9 @@ export class JetBrainsDistribution extends JavaBase {
       page_index++;
     }
 
-    if (this.stable) {
     // Add versions not available from the API but are downloadable
     const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-      rawVersions.push(
-        ...hidden.map(tag => ({tag_name: tag, name: tag, prerelease: false}))
-      );
-    }
+    rawVersions.push(...hidden.map(tag => ({tag_name: tag, name: tag})));
 
     const versions0 = rawVersions.map(async v => {
       // Release tags look like one of these:
@@ -161,7 +148,7 @@ export class JetBrainsDistribution extends JavaBase {
 
       const vsplit = vstring.split('b');
       let semver = vsplit[0];
-      const build = vsplit[1];
+      const build = +vsplit[1];
 
       // Normalize semver
       if (!semver.includes('.') && !semver.includes('_'))

src/distributions/jetbrains/models.ts

@@ -3,12 +3,11 @@
 export interface IJetBrainsRawVersion {
   tag_name: string;
   name: string;
-  prerelease: boolean;
 }
 
 export interface IJetBrainsVersion {
   tag_name: string;
   semver: string;
-  build: string;
+  build: number;
   url: string;
 }