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 support early version

Browse source
This commit is contained in:
mahabaleshwars 2024-03-07 22:03:52 +05:30
parent c2eed4c7f8
commit d6dce30547
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dist/cleanup/index.js vendored
View file

@ -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?(?<version>[^\s]+)$/m;
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+(?:[-+]\S+)?)$/m;
}
else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

2
dist/setup/index.js vendored
View file

@ -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?(?<version>[^\s]+)$/m;
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+(?:[-+]\S+)?)$/m;
}
else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

2
src/util.ts
View file

@ -120,7 +120,7 @@ export function getVersionFromFileContent(
): string | null {
let javaVersionRegExp: RegExp;
if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+)$/m;
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s]+(?:[-+]\S+)?)$/m;
} else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} else {