mirror of
https://github.com/actions/setup-java.git
synced 2025-06-28 20:14:14 +00:00
updated regex
This commit is contained in:
parent
a35ec490e8
commit
88a3812f0e
4 changed files with 4 additions and 8 deletions
3
dist/cleanup/index.js
vendored
3
dist/cleanup/index.js
vendored
|
@ -93633,8 +93633,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
}
|
||||
const versionFileName = getFileName(versionFile);
|
||||
if (versionFileName == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
|
||||
javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
|
||||
}
|
||||
else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue