mirror of
https://github.com/actions/setup-java.git
synced 2025-08-22 20:25:12 +00:00
Merge 7b9321c8d0
into e9343db97e
This commit is contained in:
commit
7b0967b8d6
8 changed files with 11 additions and 6 deletions
2
dist/setup/index.js
vendored
2
dist/setup/index.js
vendored
|
@ -132739,7 +132739,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
|
|||
const versionFileName = getFileName(versionFile);
|
||||
if (versionFileName == '.tool-versions') {
|
||||
javaVersionRegExp =
|
||||
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
|
||||
/^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
|
||||
}
|
||||
else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue