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

more fixes

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-24 20:30:55 +03:00
commit 5b26cf56c2
3 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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('+', '-');
}
@ -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)}`);
@ -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) {