actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 01:46:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

new regex

Browse source
This commit is contained in:
mahabaleshwars 2024-03-08 12:26:41 +05:30
parent 49631827e1
commit 5633ed7ce0
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dist/cleanup/index.js vendored
View file

@ -87892,12 +87892,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = javaVersionRegExp =
/^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
} }
else if (versionFile == '.java-version') { else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/; javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
} }
else { else {
throw new Error('Invalid version file'); throw new Error('Invalid version file');

4
dist/setup/index.js vendored
View file

@ -125266,12 +125266,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = javaVersionRegExp =
/^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
} }
else if (versionFile == '.java-version') { else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/; javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
} }
else { else {
throw new Error('Invalid version file'); throw new Error('Invalid version file');

4
src/util.ts
View file

@ -121,11 +121,9 @@ export function getVersionFromFileContent(
let javaVersionRegExp: RegExp; let javaVersionRegExp: RegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = javaVersionRegExp =
/^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
} else if (versionFile == '.java-version') { } else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/; javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
} else { } else {
throw new Error('Invalid version file'); throw new Error('Invalid version file');
} }