mirror of
https://github.com/actions/setup-java.git
synced 2025-05-21 09:51:47 +00:00
new regex for early version
This commit is contained in:
parent
7e1d245a33
commit
7c2ba3003d
2
dist/cleanup/index.js
vendored
2
dist/cleanup/index.js
vendored
@ -87891,7 +87891,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
||||
var _a, _b, _c, _d, _e;
|
||||
let javaVersionRegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
javaVersionRegExp = /^java\s+(\S+)/m;
|
||||
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
|
||||
}
|
||||
else if (versionFile == '.java-version') {
|
||||
|
2
dist/setup/index.js
vendored
2
dist/setup/index.js
vendored
@ -125265,7 +125265,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
||||
var _a, _b, _c, _d, _e;
|
||||
let javaVersionRegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
javaVersionRegExp = /^java\s+(\S+)/m;
|
||||
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
|
||||
}
|
||||
else if (versionFile == '.java-version') {
|
||||
|
@ -120,7 +120,7 @@ export function getVersionFromFileContent(
|
||||
): string | null {
|
||||
let javaVersionRegExp: RegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
javaVersionRegExp = /^java\s+(\S+)/m;
|
||||
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
|
||||
} else if (versionFile == '.java-version') {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
|
Loading…
Reference in New Issue
Block a user