mirror of
https://github.com/actions/setup-java.git
synced 2025-04-18 00:46:45 +00:00
added coreinfo to analyze
This commit is contained in:
parent
23f648d404
commit
108d3372dc
3 changed files with 6 additions and 0 deletions
2
dist/cleanup/index.js
vendored
2
dist/cleanup/index.js
vendored
|
@ -87892,9 +87892,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
let javaVersionRegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
|
||||
core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
}
|
||||
else if (versionFile == '.java-version') {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
}
|
||||
else {
|
||||
throw new Error('Invalid version file');
|
||||
|
|
2
dist/setup/index.js
vendored
2
dist/setup/index.js
vendored
|
@ -125266,9 +125266,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
let javaVersionRegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
|
||||
core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
}
|
||||
else if (versionFile == '.java-version') {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
}
|
||||
else {
|
||||
throw new Error('Invalid version file');
|
||||
|
|
|
@ -121,8 +121,10 @@ export function getVersionFromFileContent(
|
|||
let javaVersionRegExp: RegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
|
||||
core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
} else if (versionFile == '.java-version') {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
|
||||
} else {
|
||||
throw new Error('Invalid version file');
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue