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

handle 4th digit

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-10 19:54:50 +03:00
parent fb17d0223d
commit 408d6f3eea
8 changed files with 3172 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/distributions/zulu/installer.ts
View file

@ -7,7 +7,7 @@ import semver from 'semver';
import { JavaBase } from '../base-installer';
import { IZuluVersions } from './models';
import { extractJdkFile, getDownloadArchiveExtension } from '../../util';
import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
export class ZuluDistribution extends JavaBase {
@ -15,7 +15,7 @@ export class ZuluDistribution extends JavaBase {
super('Zulu', installerOptions);
}
protected async findPackageForDownload(version: semver.Range): Promise<JavaDownloadRelease> {
protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
const availableVersionsRaw = await this.getAvailableVersions();
const availableVersions = availableVersionsRaw.map(item => {
return {
@ -26,7 +26,7 @@ export class ZuluDistribution extends JavaBase {
});
const satisfiedVersions = availableVersions
.filter(item => semver.satisfies(item.version, version))
.filter(item => isVersionSatisfies(version, item.version))
.sort((a, b) => {
// Azul provides two versions: jdk_version and azul_version
// we should sort by both fields by descending
@ -49,7 +49,7 @@ export class ZuluDistribution extends JavaBase {
? `\nAvailable versions: ${availableOptions}`
: '';
throw new Error(
`Could not find satisfied version for semver ${version.raw}. ${availableOptionsMessage}`
`Could not find satisfied version for semver ${version}. ${availableOptionsMessage}`
);
}