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

updated regex to match the new version file format

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

4
dist/cleanup/index.js vendored
View file

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

4
dist/setup/index.js vendored
View file

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

4
src/util.ts
View file

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