mirror of
https://github.com/actions/setup-java.git
synced 2025-07-09 06:30:51 +00:00
try to handle _ versions
This commit is contained in:
parent
502a6650cd
commit
43d20d86dc
9
.github/workflows/e2e-versions.yml
vendored
9
.github/workflows/e2e-versions.yml
vendored
@ -33,6 +33,15 @@ jobs:
|
||||
- name: Verify Java
|
||||
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
|
||||
shell: bash
|
||||
- name: setup-java
|
||||
uses: ./
|
||||
id: setup-java2
|
||||
with:
|
||||
java-version: ${{ matrix.version }}
|
||||
distribution: ${{ matrix.distribution }}
|
||||
- name: Verify Java
|
||||
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
|
||||
shell: bash
|
||||
|
||||
setup-java-major-minor-versions:
|
||||
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
|
||||
|
6369
dist/cleanup/index.js
vendored
6369
dist/cleanup/index.js
vendored
File diff suppressed because it is too large
Load Diff
44888
dist/setup/index.js
vendored
44888
dist/setup/index.js
vendored
File diff suppressed because it is too large
Load Diff
@ -63,7 +63,7 @@ export abstract class JavaBase {
|
||||
const cleanVersion = semver.clean(version);
|
||||
return `${cleanVersion}-ea`;
|
||||
}
|
||||
return version;
|
||||
return version.replace('+', '_');
|
||||
}
|
||||
|
||||
protected findInToolcache(): JavaInstallerResults | null {
|
||||
@ -74,7 +74,7 @@ export abstract class JavaBase {
|
||||
.filter(item => item.endsWith('-ea') === !this.stable);
|
||||
|
||||
const satisfiedVersions = availableVersions
|
||||
.filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '')))
|
||||
.filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+')))
|
||||
.sort(semver.rcompare);
|
||||
if (!satisfiedVersions || satisfiedVersions.length === 0) {
|
||||
return null;
|
||||
|
Loading…
Reference in New Issue
Block a user