actions/setup-java
5
0
Fork 0
mirror of https://gitea.com/actions/setup-java.git synced 2025-10-29 07:47:09 +00:00
Code Activity

fix check-failures for dragonwell

Browse Source
This commit is contained in:
Aparna Jyothi
2025-04-14 13:18:29 +05:30
parent 72c9ce2c84
commit 679410561c
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/e2e-versions.yml vendored
View File

@@ -1,4 +1,3 @@
name: Validate Java e2e
on:

7
dist/setup/index.js vendored
View File

@@ -130914,9 +130914,10 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
}
// 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.
if (jdkVersion.split('.').length > 3) {
jdkVersion = util_1.convertVersionToSemver(jdkVersion);
}
const jdkVersionNums = jdkVersion
.replace('+', '.')
.split('.');
jdkVersion = util_1.convertVersionToSemver(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
for (const edition in archMap) {
eligibleVersions.push({
os: platform,

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

@@ -149,9 +149,14 @@ export class DragonwellDistribution extends JavaBase {
// 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.
if (jdkVersion.split('.').length > 3) {
jdkVersion = convertVersionToSemver(jdkVersion);
}
const jdkVersionNums: string[] = jdkVersion
.replace('+', '.')
.split('.');
jdkVersion = convertVersionToSemver(
`${jdkVersionNums.slice(0, 3).join('.')}.${
jdkVersionNums[jdkVersionNums.length - 1]
}`
);
for (const edition in archMap) {
eligibleVersions.push({