mirror of
https://github.com/actions/setup-java.git
synced 2025-04-20 09:56:46 +00:00
new regex
This commit is contained in:
parent
49631827e1
commit
5633ed7ce0
3 changed files with 3 additions and 9 deletions
4
dist/setup/index.js
vendored
4
dist/setup/index.js
vendored
|
@ -125266,12 +125266,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
let javaVersionRegExp;
|
||||
if (versionFile == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
|
||||
/^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
}
|
||||
else if (versionFile == '.java-version') {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
|
||||
}
|
||||
else {
|
||||
throw new Error('Invalid version file');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue