actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2026-07-02 10:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge a3c03fb332 into fd08b9c8dc

Browse Source
This commit is contained in:
Accelerator1996 2024-07-01 09:26:20 +00:00 committed by GitHub
commit da4b2ea389
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/setup/index.js vendored
View File

@ -124232,7 +124232,16 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
// Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits). // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
// Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools. // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
if (jdkVersion.split('.').length > 3) { if (jdkVersion.split('.').length > 3) {
jdkVersion = (0, util_1.convertVersionToSemver)(jdkVersion); const jdkVersionNums = jdkVersion.split('.');
const splitedJdkVersionList = jdkVersionNums.slice(0, 3);
if (jdkVersion.includes('+')) {
const buildParts = jdkVersion.split('+');
splitedJdkVersionList.push(buildParts[buildParts.length - 1]);
}
else {
splitedJdkVersionList.push(jdkVersionNums[jdkVersionNums.length - 1]);
}
jdkVersion = (0, util_1.convertVersionToSemver)(splitedJdkVersionList.join('.'));
} }
for (const edition in archMap) { for (const edition in archMap) {
eligibleVersions.push({ eligibleVersions.push({

12
src/distributions/dragonwell/installer.ts
View File

@ -150,7 +150,17 @@ export class DragonwellDistribution extends JavaBase {
// Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits). // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
// Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools. // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
if (jdkVersion.split('.').length > 3) { if (jdkVersion.split('.').length > 3) {
jdkVersion = convertVersionToSemver(jdkVersion); const jdkVersionNums: string[] = jdkVersion.split('.');
const splitedJdkVersionList: string[] = jdkVersionNums.slice(0, 3);
if (jdkVersion.includes('+')) {
const buildParts: string[] = jdkVersion.split('+');
splitedJdkVersionList.push(buildParts[buildParts.length - 1]);
} else {
splitedJdkVersionList.push(
jdkVersionNums[jdkVersionNums.length - 1]
);
}
jdkVersion = convertVersionToSemver(splitedJdkVersionList.join('.'));
} }
for (const edition in archMap) { for (const edition in archMap) {