fix an issue

joschi · Aug 5, 2021 · bb06c65 · bb06c65
1 parent 4fa0d73
commit bb06c65
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/__tests__/distributors/base-installer.test.ts b/__tests__/distributors/base-installer.test.ts
@@ -312,9 +312,7 @@ describe('normalizeVersion', () => {
     ['11.0', { version: '11.0', stable: true }],
     ['11.0.10', { version: '11.0.10', stable: true }],
     ['11-ea', { version: '11', stable: false }],
-    ['11.0.2-ea', { version: '11.0.2', stable: false }],
-    ['17.0.0-beta', { version: '17.0.0', stable: false }],
-    ['17.0.0-beta+33.0', { version: '17.0.0+33.0', stable: false }]
+    ['11.0.2-ea', { version: '11.0.2', stable: false }]
   ])('normalizeVersion from %s to %s', (input, expected) => {
     expect(DummyJavaBase.prototype.normalizeVersion.call(null, input)).toEqual(expected);
   });

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -4068,15 +4068,6 @@ class JavaBase {
             version = version.replace('-ea.', '+');
             stable = false;
         }
-        else if (version.endsWith('-beta')) {
-            version = version.replace(/-beta$/, '');
-            stable = false;
-        }
-        else if (version.includes('-beta+')) {
-            // transform '11.0.0-beta+33' -> '11.0.3+33'
-            version = version.replace('-beta', '');
-            stable = false;
-        }
         if (!semver_1.default.validRange(version)) {
             throw new Error(`The string '${version}' is not valid SemVer notation for a Java version. Please check README file for code snippets and more detailed information`);
         }
@@ -39946,6 +39937,7 @@ class TemurinDistribution extends base_installer_1.JavaBase {
             const availableVersionsWithBinaries = availableVersionsRaw
                 .filter(item => item.binaries.length > 0)
                 .map(item => {
+                // normalize 17.0.0-beta+33.0.202107301459 to 17.0.0+33.0.202107301459 for earlier access versions
                 const formattedVersion = this.stable
                     ? item.version_data.semver
                     : item.version_data.semver.replace('-beta+', '+');

diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts
@@ -127,13 +127,6 @@ export abstract class JavaBase {
       // transform '11.0.3-ea.2' -> '11.0.3+2'
       version = version.replace('-ea.', '+');
       stable = false;
-    } else if (version.endsWith('-beta')) {
-      version = version.replace(/-beta$/, '');
-      stable = false;
-    } else if (version.includes('-beta+')) {
-      // transform '11.0.0-beta+33' -> '11.0.3+33'
-      version = version.replace('-beta', '');
-      stable = false;
     }
 
     if (!semver.validRange(version)) {

diff --git a/src/distributions/temurin/installer.ts b/src/distributions/temurin/installer.ts
@@ -27,6 +27,7 @@ export class TemurinDistribution extends JavaBase {
     const availableVersionsWithBinaries = availableVersionsRaw
       .filter(item => item.binaries.length > 0)
       .map(item => {
+        // normalize 17.0.0-beta+33.0.202107301459 to 17.0.0+33.0.202107301459 for earlier access versions
         const formattedVersion = this.stable
           ? item.version_data.semver
           : item.version_data.semver.replace('-beta+', '+');