Skip to content

Avoid "+" sign in Java path in v2-preview #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxim-lobanov merged 12 commits into from
Mar 27, 2021
Merged

Avoid "+" sign in Java path in v2-preview #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
43d20d8
try to handle _ versions
Mar 24, 2021
d288ea3
more logs
Mar 24, 2021
d96b43d
more debug
Mar 24, 2021
8326d77
test 1
Mar 24, 2021
5b26cf5
more fixes
Mar 24, 2021
30d97e2
fix typo
Mar 24, 2021
ea48055
Update e2e-versions.yml
Mar 24, 2021
c3c81d7
Merge branch 'v2-preview' of https://github.com/actions/setup-java in…
Mar 25, 2021
60bf0a8
add unit-tests
Mar 25, 2021
3543f3b
remove debug info from tests
Mar 25, 2021
4f8daf0
debug pre-cached versions
Mar 26, 2021
8bdc3ba
change e2e tests to ubuntu-latest
Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more fixes
  • Loading branch information
Maxim Lobanov
Maxim Lobanov committed Mar 24, 2021
commit 5b26cf56c2a25754bc50928b0245e8ec4577a7a1
20 changes: 18 additions & 2 deletions .github/workflows/e2e-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ jobs:

setup-java-ea-versions-zulu:
name: zulu ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
needs: setup-java-major-minor-versions
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -100,10 +99,18 @@ 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: zulu
- name: Verify Java
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
shell: bash

setup-java-ea-versions-adopt:
name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
needs: setup-java-major-minor-versions
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -122,6 +129,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: zulu
- name: Verify Java
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
shell: bash

setup-java-custom-package-type:
name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
Expand Down
20 changes: 14 additions & 6 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3933,8 +3933,12 @@ class JavaBase {
}
getToolcacheVersionName(version) {
if (!this.stable) {
const cleanVersion = semver_1.default.clean(version);
return `${cleanVersion}-ea`;
if (version.includes('+')) {
return version.replace('+', '-ea.');
}
else {
return `${version}-ea`;
}
}
return version.replace('+', '-');
}
Expand All @@ -3943,13 +3947,17 @@ class JavaBase {
// if *-ea is provided, take only ea versions from toolcache, otherwise - only stable versions
const availableVersions = tc
.findAllVersions(this.toolcacheFolderName, this.architecture)
.filter(item => item.endsWith('-ea') === !this.stable)
.map(item => {
return {
version: item.replace(/-ea$/, '').replace('-', '+'),
path: util_1.getToolcachePath(this.toolcacheFolderName, item, this.architecture)
version: item
.replace('-ea.', '+')
.replace(/-ea$/, '')
.replace('-', '+'),
path: util_1.getToolcachePath(this.toolcacheFolderName, item, this.architecture),
stable: item.includes('-ea')
};
});
})
.filter(item => item.stable === this.stable);
console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
const satisfiedVersions = availableVersions
.filter(item => util_1.isVersionSatisfies(this.version, item.version))
Expand Down
24 changes: 16 additions & 8 deletions src/distributions/base-installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@ export abstract class JavaBase {

protected getToolcacheVersionName(version: string): string {
if (!this.stable) {
const cleanVersion = semver.clean(version);
return `${cleanVersion}-ea`;
if (version.includes('+')) {
return version.replace('+', '-ea.');
} else {
return `${version}-ea`;
}
}

return version.replace('+', '-');
}

Expand All @@ -71,13 +75,17 @@ export abstract class JavaBase {
// if *-ea is provided, take only ea versions from toolcache, otherwise - only stable versions
const availableVersions = tc
.findAllVersions(this.toolcacheFolderName, this.architecture)
.filter(item => item.endsWith('-ea') === !this.stable)
.map(item => {
return {
version: item.replace(/-ea$/, '').replace('-', '+'),
path: getToolcachePath(this.toolcacheFolderName, item, this.architecture)
} as JavaInstallerResults;
});
version: item
.replace('-ea.', '+')
.replace(/-ea$/, '')
.replace('-', '+'),
path: getToolcachePath(this.toolcacheFolderName, item, this.architecture),
stable: item.includes('-ea')
};
})
.filter(item => item.stable === this.stable);

console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);

Expand All @@ -93,7 +101,7 @@ export abstract class JavaBase {

console.log(`satisfiedVersions = ${JSON.stringify(satisfiedVersions)}`);

return satisfiedVersions[0];
return satisfiedVersions[0] as JavaInstallerResults;
}

protected normalizeVersion(version: string) {
Expand Down