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

used java version regex

Browse source
This commit is contained in:
mahabaleshwars 2024-03-08 12:56:45 +05:30
parent dc078972fe
commit ac5ac98c37
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; var _a, _b, _c, _d, _e;
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\d*)?)$/m; javaVersionRegExp = /^java\s(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} }
else if (versionFile == '.java-version') { else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/; 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; var _a, _b, _c, _d, _e;
let javaVersionRegExp; let javaVersionRegExp;
if (versionFile == '.tool-versions') { if (versionFile == '.tool-versions') {
javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\d*)?)$/m; javaVersionRegExp = /^java\s(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
} }
else if (versionFile == '.java-version') { else if (versionFile == '.java-version') {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/; javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;

2
src/util.ts
View file

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