From 7c2ba3003dfc4e87f0fd690f958c730bcc599018 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Fri, 8 Mar 2024 12:07:07 +0530 Subject: [PATCH] new regex for early version --- dist/cleanup/index.js | 2 +- dist/setup/index.js | 2 +- src/util.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 923b9cc7..2a69d4ef 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -87891,7 +87891,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + javaVersionRegExp = /^java\s+(\S+)/m; core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`); } else if (versionFile == '.java-version') { diff --git a/dist/setup/index.js b/dist/setup/index.js index 095e11fb..b94e2f90 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125265,7 +125265,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + javaVersionRegExp = /^java\s+(\S+)/m; core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`); } else if (versionFile == '.java-version') { diff --git a/src/util.ts b/src/util.ts index 29a9c6e1..52248d9a 100644 --- a/src/util.ts +++ b/src/util.ts @@ -120,7 +120,7 @@ export function getVersionFromFileContent( ): string | null { let javaVersionRegExp: RegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + javaVersionRegExp = /^java\s+(\S+)/m; core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`); } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/;