updated regex

actions · Mar 8, 2024 · 7e1d245 · 7e1d245
1 parent 600bab6
commit 7e1d245
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -87891,7 +87891,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
+        javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
+        core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -125265,7 +125265,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
+        javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
+        core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

diff --git a/src/util.ts b/src/util.ts
@@ -120,7 +120,8 @@ export function getVersionFromFileContent(
 ): string | null {
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
-    javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
+    javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
+    core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {