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

updated regex

Browse source
This commit is contained in:
mahabaleshwars 2024-03-08 11:55:42 +05:30
parent 600bab6918
commit 7e1d245a33
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dist/cleanup/index.js vendored
View file

@ -87891,7 +87891,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
var _a, _b, _c, _d, _e; var _a, _b, _c, _d, _e;
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m; javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
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|$)/;

3
dist/setup/index.js vendored
View file

@ -125265,7 +125265,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
var _a, _b, _c, _d, _e; var _a, _b, _c, _d, _e;
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m; javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
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|$)/;

3
src/util.ts
View file

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