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-05-19 08:16:32 +00:00 · 2025-04-15 09:00:12 +05:30 · 2025-04-15 09:00:12 +05:30 · dda1638bc0
commit dda1638bc0
parent 0ab4596768
24 changed files with 64972 additions and 5108 deletions
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.yml
@ -121,7 +121,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-22.04]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -132,11 +132,16 @@ jobs:
          distribution: 'adopt'
          java-version: '11'
          cache: sbt
+      - name: Setup SBT
+        if: matrix.os == 'macos-13'
+        run: |
+          echo ""Installing SBT...""
+          brew install sbt
      - name: Create files to cache
        run: sbt update

      - name: Check files to cache on macos-latest
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
        run: |
          if [ ! -d ~/Library/Caches/Coursier ]; then
            echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -20,7 +20,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-2022, ubuntu-22.04]
        distribution: [
            'temurin',
            'adopt',
@ -37,10 +37,10 @@ jobs:
          - distribution: microsoft
            version: 8
          - distribution: dragonwell
-            os: macos-latest
+            os: macos-13
        include:
          - distribution: oracle
-            os: macos-latest
+            os: macos-13
            version: 17
          - distribution: oracle
            os: windows-latest
@ -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'
@ -171,7 +171,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
@ -215,7 +215,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']
@ -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:
@ -311,7 +311,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
@ -335,7 +335,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
@ -359,7 +359,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
--- a/.licenses/npm/@actions/cache.dep.yml
+++ b/.licenses/npm/@actions/cache.dep.yml
--- a/.licenses/npm/@actions/core.dep.yml
+++ b/.licenses/npm/@actions/core.dep.yml
--- a/.licenses/npm/@actions/exec.dep.yml
+++ b/.licenses/npm/@actions/exec.dep.yml
--- a/.licenses/npm/@actions/http-client-2.2.3.dep.yml
+++ b/.licenses/npm/@actions/http-client-2.2.3.dep.yml
--- a/.licenses/npm/@azure/abort-controller.dep.yml
+++ b/.licenses/npm/@azure/abort-controller.dep.yml
--- a/.licenses/npm/@fastify/busboy.dep.yml
+++ b/.licenses/npm/@fastify/busboy.dep.yml
--- a/.licenses/npm/@protobuf-ts/plugin-framework.dep.yml
+++ b/.licenses/npm/@protobuf-ts/plugin-framework.dep.yml
--- a/.licenses/npm/@protobuf-ts/plugin.dep.yml
+++ b/.licenses/npm/@protobuf-ts/plugin.dep.yml
--- a/.licenses/npm/@protobuf-ts/protoc.dep.yml
+++ b/.licenses/npm/@protobuf-ts/protoc.dep.yml
--- a/.licenses/npm/@protobuf-ts/runtime-rpc.dep.yml
+++ b/.licenses/npm/@protobuf-ts/runtime-rpc.dep.yml
--- a/.licenses/npm/@protobuf-ts/runtime.dep.yml
+++ b/.licenses/npm/@protobuf-ts/runtime.dep.yml
--- a/.licenses/npm/psl.dep.yml
+++ b/.licenses/npm/psl.dep.yml
--- a/.licenses/npm/punycode.dep.yml
+++ b/.licenses/npm/punycode.dep.yml
--- a/.licenses/npm/semver-6.3.1.dep.yml
+++ b/.licenses/npm/semver-6.3.1.dep.yml
--- a/.licenses/npm/tough-cookie.dep.yml
+++ b/.licenses/npm/tough-cookie.dep.yml
--- a/.licenses/npm/typescript.dep.yml
+++ b/.licenses/npm/typescript.dep.yml
--- a/.licenses/npm/ip-regex.dep.yml
+++ b/.licenses/npm/ip-regex.dep.yml
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -26,7 +26,7 @@
  "author": "GitHub",
  "license": "MIT",
  "dependencies": {
-    "@actions/cache": "^3.0.4",
+    "@actions/cache": "^4.0.3",
    "@actions/core": "^1.10.0",
    "@actions/exec": "^1.0.4",
    "@actions/glob": "^0.2.0",
--- 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({