Fix the bug about parsing dragonwell version (actions#642)

Accelerator1996 · Jul 1, 2024 · 2f86b5b · 2f86b5b
1 parent fd08b9c
commit 2f86b5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -124232,6 +124232,11 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
                 // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
                 // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
                 if (jdkVersion.split('.').length > 3) {
+                    jdkVersion = jdkVersion.split('.').slice(0, 3).join('.');
+                    if (jdkVersion.includes('+')) {
+                        const buildParts = jdkVersion.split('+');
+                        jdkVersion += buildParts[buildParts.length - 1];
+                    }
                     jdkVersion = (0, util_1.convertVersionToSemver)(jdkVersion);
                 }
                 for (const edition in archMap) {

diff --git a/src/distributions/dragonwell/installer.ts b/src/distributions/dragonwell/installer.ts
@@ -150,6 +150,11 @@ export class DragonwellDistribution extends JavaBase {
         // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
         // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
         if (jdkVersion.split('.').length > 3) {
+          jdkVersion = jdkVersion.split('.').slice(0, 3).join('.');
+          if (jdkVersion.includes('+')) {
+            const buildParts: string[] = jdkVersion.split('+');
+            jdkVersion += buildParts[buildParts.length - 1];
+          }
           jdkVersion = convertVersionToSemver(jdkVersion);
         }