mirror of
https://github.com/actions/setup-java.git
synced 2025-04-19 17:36:45 +00:00
fix check-failures for dragonwell
This commit is contained in:
parent
72c9ce2c84
commit
679410561c
3 changed files with 12 additions and 7 deletions
1
.github/workflows/e2e-versions.yml
vendored
1
.github/workflows/e2e-versions.yml
vendored
|
@ -1,4 +1,3 @@
|
|||
|
||||
name: Validate Java e2e
|
||||
|
||||
on:
|
||||
|
|
7
dist/setup/index.js
vendored
7
dist/setup/index.js
vendored
|
@ -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,
|
||||
|
|
|
@ -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({
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue