mirror of
https://github.com/actions/setup-java.git
synced 2025-04-20 01:46:46 +00:00
Merge 77c7e7f1ab
into c5195efecf
This commit is contained in:
commit
ef4ec30bb7
8 changed files with 200 additions and 9 deletions
3
dist/cleanup/index.js
vendored
3
dist/cleanup/index.js
vendored
|
@ -93636,6 +93636,9 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
javaVersionRegExp =
|
||||
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
}
|
||||
else if (versionFileName == '.sdkmanrc') {
|
||||
javaVersionRegExp = /^java\s*=\s*(?<version>[^-]+)/m;
|
||||
}
|
||||
else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue