actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 09:56:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

try to handle _ versions

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-24 16:36:40 +03:00
parent 502a6650cd
commit 43d20d86dc
4 changed files with 19514 additions and 31756 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/e2e-versions.yml vendored
View file

@ -33,6 +33,15 @@ jobs:
- name: Verify Java - name: Verify Java
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}" run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
shell: bash 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: setup-java-major-minor-versions:
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}

6369
dist/cleanup/index.js vendored
View file

File diff suppressed because it is too large Load diff

42534
dist/setup/index.js vendored
View file

File diff suppressed because it is too large Load diff

4
src/distributions/base-installer.ts
View file

@ -63,7 +63,7 @@ export abstract class JavaBase {
const cleanVersion = semver.clean(version); const cleanVersion = semver.clean(version);
return `${cleanVersion}-ea`; return `${cleanVersion}-ea`;
} }
return version; return version.replace('+', '_');
} }
protected findInToolcache(): JavaInstallerResults | null { protected findInToolcache(): JavaInstallerResults | null {
@ -74,7 +74,7 @@ export abstract class JavaBase {
.filter(item => item.endsWith('-ea') === !this.stable); .filter(item => item.endsWith('-ea') === !this.stable);
const satisfiedVersions = availableVersions const satisfiedVersions = availableVersions
.filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, ''))) .filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+')))
.sort(semver.rcompare); .sort(semver.rcompare);
if (!satisfiedVersions || satisfiedVersions.length === 0) { if (!satisfiedVersions || satisfiedVersions.length === 0) {
return null; return null;