Merge 8a368078bd into ebb356cc4e

__tests__/distributors/jetbrains-installer.test.ts

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

dist/setup/index.js

@@ -129695,7 +129695,12 @@ 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 paginationPage = (yield this.http.getJson(rawUrl, requestHeaders)).result;
+                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);
                 if (!paginationPage || paginationPage.length === 0) {
                     // break infinity loop because we have reached end of pagination
                     break;
@@ -129703,9 +129708,11 @@ 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 })));
+                rawVersions.push(...hidden.map(tag => ({ tag_name: tag, name: tag, prerelease: false })));
+            }
             const versions0 = rawVersions.map((v) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 // Release tags look like one of these:
@@ -129724,7 +129731,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`;

src/distributions/jetbrains/installer.ts

@@ -113,9 +113,18 @@ export class JetBrainsDistribution extends JavaBase {
         core.debug(`Gathering available versions from '${rawUrl}'`);
       }
 
-      const paginationPage = (
+      const paginationPageResult = (
         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;
@@ -125,9 +134,13 @@ 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})));
+      rawVersions.push(
+        ...hidden.map(tag => ({tag_name: tag, name: tag, prerelease: false}))
+      );
+    }
 
     const versions0 = rawVersions.map(async v => {
       // Release tags look like one of these:
@@ -148,7 +161,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,11 +3,12 @@
 export interface IJetBrainsRawVersion {
   tag_name: string;
   name: string;
+  prerelease: boolean;
 }
 
 export interface IJetBrainsVersion {
   tag_name: string;
   semver: string;
-  build: number;
+  build: string;
   url: string;
 }