From 837769072b3eb201edd403047baab136c6a38732 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 12:16:59 +0530 Subject: [PATCH 01/10] dragonwell fix --- .github/workflows/e2e-versions.yml | 89 ++++++++++++++++-------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index f963cd7..97d2db7 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -14,46 +14,55 @@ on: - cron: '0 */12 * * *' workflow_dispatch: jobs: - setup-java-major-versions: - name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [macos-13, windows-latest, ubuntu-latest] - distribution: [ - 'temurin', - 'adopt', - 'adopt-openj9', - 'zulu', - 'liberica', - 'microsoft', - 'semeru', - 'corretto', - 'dragonwell' - ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['8', '11', '17'] - exclude: - - distribution: microsoft - version: 8 - - distribution: dragonwell - os: macos-latest - include: - - distribution: oracle - os: macos-latest - version: 17 - - distribution: oracle - os: windows-latest - version: 20 - - distribution: oracle - os: ubuntu-latest - version: 20 - - distribution: dragonwell - os: ubuntu-latest - version: '11.0' - - distribution: dragonwell - os: ubuntu-latest - version: '11.0.13+9' + setup-java-major-versions: + name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-13, windows-latest, ubuntu-latest] + distribution: [ + 'temurin', + 'adopt', + 'adopt-openj9', + 'zulu', + 'liberica', + 'microsoft', + 'semeru', + 'corretto', + 'dragonwell' + ] # internally 'adopt-hotspot' is the same as 'adopt' + version: ['8', '11.0', '17.0.7+7'] + exclude: + - distribution: microsoft + version: 8 + - distribution: dragonwell + os: macos-latest + include: + - distribution: oracle + os: macos-latest + version: '17.0.7' + - distribution: oracle + os: windows-latest + version: '20' + - distribution: oracle + os: ubuntu-latest + version: '20' + - distribution: dragonwell + os: ubuntu-latest + version: '11.0' + - distribution: dragonwell + os: ubuntu-latest + version: '11.0.13+9' + - distribution: sapmachine + os: ubuntu-latest + version: '17.0.7' + - distribution: jetbrains + os: ubuntu-latest + version: '11.0.11' + - distribution: jetbrains + os: ubuntu-latest + version: '17.0.7' steps: - name: Checkout From 39dad2981ba09c269a8f099582f1fe355057949b Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 12:22:01 +0530 Subject: [PATCH 02/10] dragonwell fix --- .github/workflows/e2e-versions.yml | 98 +++++++++++++++--------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 97d2db7..5ed8d42 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -14,55 +14,55 @@ on: - cron: '0 */12 * * *' workflow_dispatch: jobs: - setup-java-major-versions: - name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [macos-13, windows-latest, ubuntu-latest] - distribution: [ - 'temurin', - 'adopt', - 'adopt-openj9', - 'zulu', - 'liberica', - 'microsoft', - 'semeru', - 'corretto', - 'dragonwell' - ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['8', '11.0', '17.0.7+7'] - exclude: - - distribution: microsoft - version: 8 - - distribution: dragonwell - os: macos-latest - include: - - distribution: oracle - os: macos-latest - version: '17.0.7' - - distribution: oracle - os: windows-latest - version: '20' - - distribution: oracle - os: ubuntu-latest - version: '20' - - distribution: dragonwell - os: ubuntu-latest - version: '11.0' - - distribution: dragonwell - os: ubuntu-latest - version: '11.0.13+9' - - distribution: sapmachine - os: ubuntu-latest - version: '17.0.7' - - distribution: jetbrains - os: ubuntu-latest - version: '11.0.11' - - distribution: jetbrains - os: ubuntu-latest - version: '17.0.7' + setup-java-major-versions: + name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-13, windows-latest, ubuntu-latest] + distribution: [ + 'temurin', + 'adopt', + 'adopt-openj9', + 'zulu', + 'liberica', + 'microsoft', + 'semeru', + 'corretto', + 'dragonwell' + ] # internally 'adopt-hotspot' is the same as 'adopt' + version: ['8', '11.0', '17.0.7+7'] + exclude: + - distribution: microsoft + version: 8 + - distribution: dragonwell + os: macos-latest + include: + - distribution: oracle + os: macos-latest + version: '17.0.7' + - distribution: oracle + os: windows-latest + version: '20' + - distribution: oracle + os: ubuntu-latest + version: '20' + - distribution: dragonwell + os: ubuntu-latest + version: '11.0' + - distribution: dragonwell + os: ubuntu-latest + version: '11.0.13+9' + - distribution: sapmachine + os: ubuntu-latest + version: '17.0.7' + - distribution: jetbrains + os: ubuntu-latest + version: '11.0.11' + - distribution: jetbrains + os: ubuntu-latest + version: '17.0.7' steps: - name: Checkout From daeeba334d87f744ca1e2ac6c9c0e86dfd0bc88a Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 12:40:21 +0530 Subject: [PATCH 03/10] dragonwell check failure fix --- .github/workflows/e2e-versions.yml | 38 ++++++++++-------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 5ed8d42..8e0f94b 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -1,3 +1,4 @@ + name: Validate Java e2e on: @@ -32,37 +33,22 @@ jobs: 'corretto', 'dragonwell' ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['8', '11.0', '17.0.7+7'] + version: ['17', '11', '8'] exclude: - distribution: microsoft version: 8 - distribution: dragonwell - os: macos-latest + os: macos-13 include: - distribution: oracle - os: macos-latest - version: '17.0.7' + os: macos-13 + version: 17 - distribution: oracle os: windows-latest - version: '20' + version: 20 - distribution: oracle os: ubuntu-latest - version: '20' - - distribution: dragonwell - os: ubuntu-latest - version: '11.0' - - distribution: dragonwell - os: ubuntu-latest - version: '11.0.13+9' - - distribution: sapmachine - os: ubuntu-latest - version: '17.0.7' - - distribution: jetbrains - os: ubuntu-latest - version: '11.0.11' - - distribution: jetbrains - os: ubuntu-latest - version: '17.0.7' + version: 20 steps: - name: Checkout @@ -186,7 +172,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] version: ['17-ea', '15.0.0-ea.14'] steps: - name: Checkout @@ -230,7 +216,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'semeru'] java-package: ['jre'] version: ['17.0'] @@ -326,7 +312,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto'] steps: - name: Checkout @@ -350,7 +336,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['adopt', 'adopt-openj9', 'zulu'] steps: - name: Checkout @@ -374,7 +360,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['adopt', 'zulu', 'liberica'] steps: - name: Checkout From fd07d32b82c3082eca7f347d2631ac4ae396a3a7 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 13:01:48 +0530 Subject: [PATCH 04/10] dragonwell check failures-fix --- .github/workflows/e2e-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 8e0f94b..8f1c60a 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -312,7 +312,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto'] steps: - name: Checkout @@ -336,7 +336,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['adopt', 'adopt-openj9', 'zulu'] steps: - name: Checkout From 24a47ec5824676f5e7323c720b21b4de91ed0c25 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 13:06:15 +0530 Subject: [PATCH 05/10] check failures fix --- .github/workflows/e2e-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 8f1c60a..db809b8 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -33,7 +33,7 @@ jobs: 'corretto', 'dragonwell' ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['17', '11', '8'] + version: ['21', '11', '17'] exclude: - distribution: microsoft version: 8 @@ -360,7 +360,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['adopt', 'zulu', 'liberica'] steps: - name: Checkout From 8286b986509d6283001f018306b8738cb1b8f609 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 13:19:53 +0530 Subject: [PATCH 06/10] check failures fix --- .github/workflows/e2e-versions.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index db809b8..a95ebb7 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -30,10 +30,9 @@ jobs: 'liberica', 'microsoft', 'semeru', - 'corretto', - 'dragonwell' + 'corretto' ] # internally 'adopt-hotspot' is the same as 'adopt' - version: ['21', '11', '17'] + version: ['8', '11', '17'] exclude: - distribution: microsoft version: 8 @@ -49,6 +48,19 @@ jobs: - distribution: oracle os: ubuntu-latest version: 20 + - distribution: dragonwell + os: ubuntu-latest + version: 11.0.26 + - distribution: dragonwell + os: windows-latest + version: 11.0.26 + - distribution: dragonwell + os: ubuntu-latest + version: 17.0.14 + - distribution: dragonwell + os: windows-latest + version: 17.0.14 + steps: - name: Checkout From 72c9ce2c846b928e540d47082db2b3422febe746 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 11 Apr 2025 13:38:34 +0530 Subject: [PATCH 07/10] check failure fix --- .github/workflows/e2e-versions.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index a95ebb7..18ad25c 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-2022, ubuntu-22.04] distribution: [ 'temurin', 'adopt', @@ -30,7 +30,8 @@ jobs: 'liberica', 'microsoft', 'semeru', - 'corretto' + 'corretto', + 'dragonwell' ] # internally 'adopt-hotspot' is the same as 'adopt' version: ['8', '11', '17'] exclude: @@ -48,19 +49,6 @@ jobs: - distribution: oracle os: ubuntu-latest version: 20 - - distribution: dragonwell - os: ubuntu-latest - version: 11.0.26 - - distribution: dragonwell - os: windows-latest - version: 11.0.26 - - distribution: dragonwell - os: ubuntu-latest - version: 17.0.14 - - distribution: dragonwell - os: windows-latest - version: 17.0.14 - steps: - name: Checkout From 679410561cba18bef4f8836c9c1139cfe70f74a5 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Mon, 14 Apr 2025 13:18:29 +0530 Subject: [PATCH 08/10] fix check-failures for dragonwell --- .github/workflows/e2e-versions.yml | 1 - dist/setup/index.js | 7 ++++--- src/distributions/dragonwell/installer.ts | 11 ++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 18ad25c..3cb15e7 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -1,4 +1,3 @@ - name: Validate Java e2e on: diff --git a/dist/setup/index.js b/dist/setup/index.js index 5c32617..74d9653 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -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, diff --git a/src/distributions/dragonwell/installer.ts b/src/distributions/dragonwell/installer.ts index 11ed4c2..74d6b1b 100644 --- a/src/distributions/dragonwell/installer.ts +++ b/src/distributions/dragonwell/installer.ts @@ -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({ From ba6f50b3489fae384bef0e58f366d7a1a0ceefd0 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Tue, 15 Apr 2025 08:25:33 +0530 Subject: [PATCH 09/10] macos-latest to macos-13 --- .github/workflows/e2e-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 3cb15e7..e917488 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica'] version: - '11.0' From fdb3be11b98e1c234c4f9cdc286229bdc8d91991 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Tue, 15 Apr 2025 08:40:08 +0530 Subject: [PATCH 10/10] ubuntu-latest to ubuntu-22.04 --- .github/workflows/e2e-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index e917488..63d045a 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -263,7 +263,7 @@ jobs: fail-fast: false matrix: # x86 is not supported on macOS - os: [windows-latest, ubuntu-latest] + os: [windows-latest, ubuntu-22.04] distribution: ['liberica', 'zulu', 'corretto'] version: ['11'] steps: