Compare commits

..

1 Commits

Author SHA1 Message Date
aparnajyothi-y
dda1638bc0 V3 - Bumps @action/cache to 4.0.3 (#790)
* actions-cache upgrade to 4.0.3 on node 16

* npm audit fix

* macos-latest to macos-13

* macos-latest to macos-13

* ubuntu-latest to ubuntu-22-04

* Step to install sbt and dragonwell fix for 11

* dragonwell fix

* dragonwell fix

* dragonwell check failure fix

* dragonwell check failures-fix

* check failures fix

* check failures fix

* check failure fix

* fix check-failures for dragonwell

* macos-latest to macos-13

* ubuntu-latest to ubuntu-22.04
2025-04-14 22:30:12 -05:00
3 changed files with 14 additions and 9 deletions

View File

@@ -1,4 +1,3 @@
name: Validate Java e2e name: Validate Java e2e
on: on:
@@ -70,7 +69,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [macos-13, windows-latest, ubuntu-latest]
distribution: ['temurin', 'zulu', 'liberica'] distribution: ['temurin', 'zulu', 'liberica']
version: version:
- '11.0' - '11.0'
@@ -264,7 +263,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
# x86 is not supported on macOS # x86 is not supported on macOS
os: [windows-latest, ubuntu-latest] os: [windows-latest, ubuntu-22.04]
distribution: ['liberica', 'zulu', 'corretto'] distribution: ['liberica', 'zulu', 'corretto']
version: ['11'] version: ['11']
steps: steps:

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

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