From c5831e86e5ce54dd8451d08e0dff3776a86afe47 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Fri, 8 Mar 2024 17:51:33 +0530 Subject: [PATCH] updated regex to support early versions --- 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 aea7843..cec12e2 100644 --- 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?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/dist/setup/index.js b/dist/setup/index.js index 612c987..0ce8def 100644 --- 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?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/src/util.ts b/src/util.ts index e02cea6..6a7f7bf 100644 --- 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?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {