mirror of
https://github.com/actions/setup-java.git
synced 2025-06-28 03:54:15 +00:00
Merge 448250764a
into ebb356cc4e
This commit is contained in:
commit
87326d0c0a
5 changed files with 13 additions and 4 deletions
|
@ -4,7 +4,6 @@ on:
|
|||
release:
|
||||
types: [released]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -18,4 +17,5 @@ jobs:
|
|||
uses: actions/checkout@v4
|
||||
- name: Publish
|
||||
id: publish
|
||||
|
||||
uses: actions/publish-immutable-action@v0.0.4
|
||||
|
|
2
dist/cleanup/index.js
vendored
2
dist/cleanup/index.js
vendored
|
@ -93634,7 +93634,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+){0,2}(?:[+_]\d+)?)(?=(?:[-_](?!\d))|$)(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*$/im;
|
||||
}
|
||||
else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
|
|
2
dist/setup/index.js
vendored
2
dist/setup/index.js
vendored
|
@ -131662,7 +131662,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+){0,2}(?:[+_]\d+)?)(?=(?:[-_](?!\d))|$)(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*$/im;
|
||||
}
|
||||
else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
|
|
|
@ -614,5 +614,14 @@ major versions: 8, 11, 16, 17, 21
|
|||
more specific versions: 8.0.282+8, 8.0.232, 11.0, 11.0.4, 17.0
|
||||
early access (EA) versions: 15-ea, 15.0.0-ea
|
||||
versions with specified distribution: openjdk64-11.0.2
|
||||
LTS versions : temurin-21.0.5+11.0.LTS
|
||||
```
|
||||
If the file contains multiple versions, only the first one will be recognized.
|
||||
```
|
||||
Note:
|
||||
In some complex version strings containing multiple version-like segments (e.g., java semeru-openj9-11.0.15+10_openj9-0.32.0),
|
||||
the regular expression may extract the last version segment (0.32.0) instead of the intended main version (11.0.15+10).
|
||||
Additionally, the regex is designed to support standard semantic versioning (semver) formats
|
||||
and may not correctly parse non-standard formats such as jetbrains-21b212.1.
|
||||
Users are encouraged to provide clear, semver-compliant version specifications to ensure accurate extraction.
|
||||
```
|
||||
|
|
|
@ -133,7 +133,7 @@ export function getVersionFromFileContent(
|
|||
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+){0,2}(?:[+_]\d+)?)(?=(?:[-_](?!\d))|$)(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*$/im;
|
||||
} else {
|
||||
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue