From d6dce305475b805907cc84d282ac6b5af08faf26 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 7 Mar 2024 22:03:52 +0530 Subject: [PATCH] updated regex to support 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 f8989c2..c674f28 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+-)?v?(?[^\s]+)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/dist/setup/index.js b/dist/setup/index.js index bcc8016..9a85550 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+-)?v?(?[^\s]+)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/src/util.ts b/src/util.ts index 4f4616e..f0fe20d 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+-)?v?(?[^\s]+)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {