actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-19 17:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

more debug

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-24 17:11:44 +03:00
parent d288ea3b36
commit d96b43dd0d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dist/setup/index.js vendored
View file

@ -3936,7 +3936,7 @@ class JavaBase {
const cleanVersion = semver_1.default.clean(version); const cleanVersion = semver_1.default.clean(version);
return `${cleanVersion}-ea`; return `${cleanVersion}-ea`;
} }
return version.replace('+', '_'); return version.replace('+', '-');
} }
findInToolcache() { findInToolcache() {
// we can't use tc.find directly because firstly, we need to filter versions by stability flag // we can't use tc.find directly because firstly, we need to filter versions by stability flag
@ -3946,7 +3946,7 @@ class JavaBase {
.filter(item => item.endsWith('-ea') === !this.stable); .filter(item => item.endsWith('-ea') === !this.stable);
console.log(`availableVersions = ${JSON.stringify(availableVersions)}`); console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
const satisfiedVersions = availableVersions const satisfiedVersions = availableVersions
.filter(item => util_1.isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+'))) .filter(item => util_1.isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('-', '+')))
.sort(semver_1.default.rcompare); .sort(semver_1.default.rcompare);
if (!satisfiedVersions || satisfiedVersions.length === 0) { if (!satisfiedVersions || satisfiedVersions.length === 0) {
return null; return null;

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.replace('+', '_'); return version.replace('+', '-');
} }
protected findInToolcache(): JavaInstallerResults | null { protected findInToolcache(): JavaInstallerResults | null {
@ -76,7 +76,7 @@ export abstract class JavaBase {
console.log(`availableVersions = ${JSON.stringify(availableVersions)}`); console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
const satisfiedVersions = availableVersions const satisfiedVersions = availableVersions
.filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+'))) .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;