updated regex to support early versions

actions · Mar 8, 2024 · c5831e8 · c5831e8
1 parent 8c268be
commit c5831e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -87892,7 +87892,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -125266,7 +125266,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

diff --git a/src/util.ts b/src/util.ts
@@ -121,7 +121,7 @@ export function getVersionFromFileContent(
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
     javaVersionRegExp =
-      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {