From 00ea4e377e563d7f5b8b0f2f0e2fc7c66edcd40a Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Fri, 8 Mar 2024 14:21:54 +0530 Subject: [PATCH] regex updated --- 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 6d68e3c..654cf8d 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(?(\d+(-ea)?))(\s|$)/; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/dist/setup/index.js b/dist/setup/index.js index 69e991d..59629a6 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(?(\d+(-ea)?))(\s|$)/; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/src/util.ts b/src/util.ts index 15dcbdd..9da5370 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(?(\d+(-ea)?))(\s|$)/; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {