mirror of
https://github.com/actions/setup-java.git
synced 2026-09-11 13:14:23 +02:00
Preserve compound Liberica build versions from .sdkmanrc (#1268)
* Initial plan * Preserve compound Liberica build versions from release metadata Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>
This commit is contained in:
co-authored by
brunoborges
copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
parent
de7274f081
commit
1aa87b638d
@@ -253,6 +253,39 @@ describe('findPackageForDownload', () => {
|
|||||||
expect(result.version).toBe(expected);
|
expect(result.version).toBe(expected);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('compound build versions', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
distribution['getAvailableVersions'] = async () =>
|
||||||
|
['1', '1.1', '1.2', '1.10'].map(build => ({
|
||||||
|
featureVersion: 25,
|
||||||
|
interimVersion: 0,
|
||||||
|
updateVersion: 4,
|
||||||
|
buildVersion: 1,
|
||||||
|
version: `25.0.4+${build}`,
|
||||||
|
downloadUrl: `https://download.bell-sw.com/java/25.0.4+${build}/bellsoft-jdk25.0.4+${build}-macos-aarch64.tar.gz`
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['25.0.4+1.1', '25.0.4+1.1'],
|
||||||
|
['25.0.4+1', '25.0.4+1'],
|
||||||
|
['25.0.4', '25.0.4+1.10'],
|
||||||
|
['25', '25.0.4+1.10']
|
||||||
|
])('version is %s -> %s', async (input, expected) => {
|
||||||
|
const result = await distribution['findPackageForDownload'](input);
|
||||||
|
expect(result).toEqual({
|
||||||
|
version: expected,
|
||||||
|
url: `https://download.bell-sw.com/java/${expected}/bellsoft-jdk${expected}-macos-aarch64.tar.gz`
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not substitute a different compound build', async () => {
|
||||||
|
await expect(
|
||||||
|
distribution['findPackageForDownload']('25.0.4+1.3')
|
||||||
|
).rejects.toThrow(/No matching version found for SemVer/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('should throw an error', async () => {
|
it('should throw an error', async () => {
|
||||||
await expect(distribution['findPackageForDownload']('17')).rejects.toThrow(
|
await expect(distribution['findPackageForDownload']('17')).rejects.toThrow(
|
||||||
/No matching version found for SemVer/
|
/No matching version found for SemVer/
|
||||||
@@ -335,6 +368,36 @@ describe('convertVersionToSemver', () => {
|
|||||||
buildVersion: 13
|
buildVersion: 13
|
||||||
},
|
},
|
||||||
'11.0.0+13'
|
'11.0.0+13'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
version: '25.0.4+1.1',
|
||||||
|
featureVersion: 25,
|
||||||
|
interimVersion: 0,
|
||||||
|
updateVersion: 4,
|
||||||
|
buildVersion: 1
|
||||||
|
},
|
||||||
|
'25.0.4+1.1'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
version: '25+36',
|
||||||
|
featureVersion: 25,
|
||||||
|
interimVersion: 0,
|
||||||
|
updateVersion: 0,
|
||||||
|
buildVersion: 36
|
||||||
|
},
|
||||||
|
'25.0.0+36'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
version: '8u202',
|
||||||
|
featureVersion: 8,
|
||||||
|
interimVersion: 0,
|
||||||
|
updateVersion: 202,
|
||||||
|
buildVersion: 8
|
||||||
|
},
|
||||||
|
'8.0.202+8'
|
||||||
]
|
]
|
||||||
])('%s -> %s', (input, expected) => {
|
])('%s -> %s', (input, expected) => {
|
||||||
const actual = distributions['convertVersionToSemver']({
|
const actual = distributions['convertVersionToSemver']({
|
||||||
|
|||||||
@@ -276,6 +276,7 @@ describe('getVersionFromFileContent', () => {
|
|||||||
['java=21.0.5-graal', '21.0.5', 'graalvm'],
|
['java=21.0.5-graal', '21.0.5', 'graalvm'],
|
||||||
['java=17.0.9-graalce', '17.0.9', 'graalvm'],
|
['java=17.0.9-graalce', '17.0.9', 'graalvm'],
|
||||||
['java=11.0.25-librca', '11.0.25', 'liberica'],
|
['java=11.0.25-librca', '11.0.25', 'liberica'],
|
||||||
|
['java=25.0.4+1.1-librca', '25.0.4+1.1', 'liberica'],
|
||||||
['java=11.0.25-ms', '11.0.25', 'microsoft'],
|
['java=11.0.25-ms', '11.0.25', 'microsoft'],
|
||||||
['java=21.0.5-oracle', '21.0.5', 'oracle'],
|
['java=21.0.5-oracle', '21.0.5', 'oracle'],
|
||||||
['java=11.0.25-sapmchn', '11.0.25', 'sapmachine'],
|
['java=11.0.25-sapmchn', '11.0.25', 'sapmachine'],
|
||||||
|
|||||||
Vendored
+2
-1
@@ -128,7 +128,8 @@ class LibericaDistributions extends _base_installer_js__WEBPACK_IMPORTED_MODULE_
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
convertVersionToSemver(version) {
|
convertVersionToSemver(version) {
|
||||||
const { buildVersion, featureVersion, interimVersion, updateVersion } = version;
|
const { featureVersion, interimVersion, updateVersion } = version;
|
||||||
|
const buildVersion = version.version.split('+')[1] || version.buildVersion;
|
||||||
const mainVersion = [featureVersion, interimVersion, updateVersion].join('.');
|
const mainVersion = [featureVersion, interimVersion, updateVersion].join('.');
|
||||||
if (buildVersion != 0) {
|
if (buildVersion != 0) {
|
||||||
return `${mainVersion}+${buildVersion}`;
|
return `${mainVersion}+${buildVersion}`;
|
||||||
|
|||||||
@@ -166,8 +166,8 @@ export class LibericaDistributions extends JavaBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private convertVersionToSemver(version: LibericaVersion): string {
|
private convertVersionToSemver(version: LibericaVersion): string {
|
||||||
const {buildVersion, featureVersion, interimVersion, updateVersion} =
|
const {featureVersion, interimVersion, updateVersion} = version;
|
||||||
version;
|
const buildVersion = version.version.split('+')[1] || version.buildVersion;
|
||||||
const mainVersion = [featureVersion, interimVersion, updateVersion].join(
|
const mainVersion = [featureVersion, interimVersion, updateVersion].join(
|
||||||
'.'
|
'.'
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user