Bump version to 1.1.0.

Incorporate additional feedback.
Incorporate more reviewer feedback.
2023-06-16 13:04:28 +02:00 · 2023-06-16 13:03:32 +02:00 · 2023-06-16 12:15:03 +02:00 · 2023-06-16 10:34:13 +02:00 · 2023-06-16 09:19:49 +02:00 · 2023-06-15 17:59:26 +02:00
10 changed files with 1940 additions and 2373 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,13 +28,6 @@ jobs:
        java-version: ['17', '20', 'dev']
        distribution: ['graalvm', 'graalvm-community']
        os: [macos-latest, windows-latest, ubuntu-latest]
-        include:
-          - java-version: '17.0.7'
-            distribution: ''
-            os: ubuntu-latest
-          - java-version: 'dev'
-            distribution: ''
-            os: windows-latest
    steps:
      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
@@ -181,13 +174,7 @@ jobs:
      matrix:
        version: ['mandrel-22.2.0.0-Final', 'mandrel-latest']
        java-version: ['17']
-        distribution: ['mandrel']
        os: [windows-latest, ubuntu-latest]
-        include:
-          - version: 'mandrel-latest'
-            java-version: '17'
-            distribution: '' # test empty distribution for backward compatibility
-            os: ubuntu-latest
        exclude: # temporarily disable Mandrel latest builds on Windows due to unavailability
          - version: 'mandrel-latest'
            java-version: '17'
@@ -198,7 +185,6 @@ jobs:
        uses: ./
        with:
          version: ${{ matrix.version }}
-          distribution: ${{ matrix.distribution }}
          java-version: ${{ matrix.java-version }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Check environment
@@ -207,7 +193,6 @@ jobs:
          [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
          echo "JAVA_HOME: $JAVA_HOME"
          java --version
-          java --version | grep "Temurin" || exit 23
          native-image --version
        if: runner.os != 'Windows'
      - name: Check Windows environment
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
--- a/dist/main/index.js
+++ b/dist/main/index.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "setup-graalvm",
-  "version": "1.1.2",
+  "version": "1.1.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "setup-graalvm",
-      "version": "1.1.2",
+      "version": "1.1.0",
      "license": "UPL",
      "dependencies": {
        "@actions/cache": "^3.0.4",
@@ -19,7 +19,7 @@
        "@actions/tool-cache": "^1.7.1",
        "@octokit/core": "^3.5.1",
        "@octokit/types": "^6.34.0",
-        "semver": "^7.5.2",
+        "semver": "^7.3.8",
        "uuid": "^8.3.2"
      },
      "devDependencies": {
@@ -74,9 +74,9 @@
      }
    },
    "node_modules/@actions/cache/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -170,9 +170,9 @@
      }
    },
    "node_modules/@actions/tool-cache/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -320,14 +320,15 @@
      }
    },
    "node_modules/@azure/ms-rest-js": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.7.0.tgz",
-      "integrity": "sha512-ngbzWbqF+NmztDOpLBVDxYM+XLcUj7nKhxGbSU9WtIsXfRB//cf2ZbAG5HkOrhU9/wd/ORRB6lM/d69RKVjiyA==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
+      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
      "dependencies": {
        "@azure/core-auth": "^1.1.4",
        "abort-controller": "^3.0.0",
        "form-data": "^2.5.0",
        "node-fetch": "^2.6.7",
+        "tough-cookie": "^3.0.1",
        "tslib": "^1.10.0",
        "tunnel": "0.0.6",
        "uuid": "^8.3.2",
@@ -415,9 +416,9 @@
      "dev": true
    },
    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -458,9 +459,9 @@
      }
    },
    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -3267,9 +3268,9 @@
      }
    },
    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -3330,9 +3331,9 @@
      }
    },
    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -4167,6 +4168,14 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/is-arguments": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -4541,9 +4550,9 @@
      }
    },
    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -5679,9 +5688,9 @@
      }
    },
    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
@@ -6270,11 +6279,15 @@
        "node": ">= 6"
      }
    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
    "node_modules/punycode": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true,
      "engines": {
        "node": ">=6"
      }
@@ -6477,9 +6490,9 @@
      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
    "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+      "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
      "dependencies": {
        "lru-cache": "^6.0.0"
      },
@@ -6821,6 +6834,19 @@
        "node": ">=8.0"
      }
    },
+    "node_modules/tough-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "dependencies": {
+        "ip-regex": "^2.1.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -7169,9 +7195,9 @@
      }
    },
    "node_modules/word-wrap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
      "dev": true,
      "engines": {
        "node": ">=0.10.0"
@@ -7323,9 +7349,9 @@
          }
        },
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
        },
        "uuid": {
          "version": "3.4.0",
@@ -7418,9 +7444,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
        },
        "uuid": {
          "version": "3.4.0",
@@ -7535,14 +7561,15 @@
      }
    },
    "@azure/ms-rest-js": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.7.0.tgz",
-      "integrity": "sha512-ngbzWbqF+NmztDOpLBVDxYM+XLcUj7nKhxGbSU9WtIsXfRB//cf2ZbAG5HkOrhU9/wd/ORRB6lM/d69RKVjiyA==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
+      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
      "requires": {
        "@azure/core-auth": "^1.1.4",
        "abort-controller": "^3.0.0",
        "form-data": "^2.5.0",
        "node-fetch": "^2.6.7",
+        "tough-cookie": "^3.0.1",
        "tslib": "^1.10.0",
        "tunnel": "0.0.6",
        "uuid": "^8.3.2",
@@ -7616,9 +7643,9 @@
          "dev": true
        },
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -7649,9 +7676,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -9796,9 +9823,9 @@
          }
        },
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -9837,9 +9864,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -10438,6 +10465,11 @@
        "side-channel": "^1.0.4"
      }
    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
+    },
    "is-arguments": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -10692,9 +10724,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -11577,9 +11609,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@@ -12001,11 +12033,15 @@
        "sisteransi": "^1.0.5"
      }
    },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
    "punycode": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
    },
    "pure-rand": {
      "version": "6.0.1",
@@ -12129,9 +12165,9 @@
      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
    },
    "semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+      "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
      "requires": {
        "lru-cache": "^6.0.0"
      },
@@ -12391,6 +12427,16 @@
        "is-number": "^7.0.0"
      }
    },
+    "tough-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "requires": {
+        "ip-regex": "^2.1.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
    "tr46": {
      "version": "0.0.3",
      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -12638,9 +12684,9 @@
      }
    },
    "word-wrap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
      "dev": true
    },
    "wrap-ansi": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "setup-graalvm",
-  "version": "1.1.2",
+  "version": "1.1.0",
  "private": true,
  "description": "GitHub Action for GraalVM",
  "main": "lib/main.js",
@@ -37,7 +37,7 @@
    "@actions/tool-cache": "^1.7.1",
    "@octokit/core": "^3.5.1",
    "@octokit/types": "^6.34.0",
-    "semver": "^7.5.2",
+    "semver": "^7.3.8",
    "uuid": "^8.3.2"
  },
  "devDependencies": {
--- a/src/features/check-for-updates.ts
+++ b/src/features/check-for-updates.ts
@@ -1,4 +1,8 @@
 import * as core from '@actions/core'
+import {getTaggedRelease, toSemVer} from '../utils'
+import {lt, major, minor, valid} from 'semver'
+import {findGraalVMVersion} from '../graalvm'
+import {GRAALVM_RELEASES_REPO} from '../constants'

 export async function checkForUpdates(
  graalVMVersion: string,
@@ -21,5 +25,23 @@ export async function checkForUpdates(
    )
    return
  }
-  // TODO: add support for JDK-specific update checks (e.g., 17.0.X)
+
+  const latestRelease = await getTaggedRelease(
+    GRAALVM_RELEASES_REPO,
+    'vm-22.3.1'
+  )
+  const latestGraalVMVersion = findGraalVMVersion(latestRelease)
+  const selectedVersion = toSemVer(graalVMVersion)
+  const latestVersion = toSemVer(latestGraalVMVersion)
+  if (
+    valid(selectedVersion) &&
+    valid(latestVersion) &&
+    lt(selectedVersion, latestVersion)
+  ) {
+    core.notice(
+      `A new GraalVM release is available! Please consider upgrading to GraalVM ${latestGraalVMVersion}. Release notes: https://www.graalvm.org/release-notes/${major(
+        latestVersion
+      )}_${minor(latestVersion)}/`
+    )
+  }
 }
--- a/src/features/reports.ts
+++ b/src/features/reports.ts
@@ -33,18 +33,11 @@ interface BuildOutput {
    name: string
    graalvm_version: string
    java_version: string | null
-    vendor_version?: string
    c_compiler: string | null
    garbage_collector: string
-    graal_compiler?: {
-      optimization_level: string
-      march: string
-      pgo?: string[]
-    }
  }
  analysis_results: {
    classes: AnalysisResult
-    types?: AnalysisResult
    fields: AnalysisResult
    methods: AnalysisResult
  }
@@ -56,9 +49,6 @@ interface BuildOutput {
    }
    image_heap: {
      bytes: number
-      objects?: {
-        count: number
-      }
      resources: {
        count: number
        bytes: number
@@ -85,12 +75,10 @@ interface BuildOutput {
      system_total: number
      peak_rss_bytes: number
    }
-    total_secs?: number
  }
 }

 export async function setUpNativeImageBuildReports(
-  isGraalVMforJDK17OrLater: boolean,
  graalVMVersion: string
 ): Promise<void> {
  const isRequired = areJobReportsEnabled() || arePRReportsEnabled()
@@ -98,9 +86,9 @@ export async function setUpNativeImageBuildReports(
    return
  }
  const isSupported =
-    isGraalVMforJDK17OrLater ||
    graalVMVersion === c.VERSION_LATEST ||
    graalVMVersion === c.VERSION_DEV ||
+    graalVMVersion.length === 0 ||
    (!graalVMVersion.startsWith(c.MANDREL_NAMESPACE) &&
      gte(toSemVer(graalVMVersion), '22.2.0'))
  if (!isSupported) {
@@ -166,12 +154,7 @@ function createReport(data: BuildOutput): string {
  const context = github.context
  const info = data.general_info
  const analysis = data.analysis_results
-  const analysisTypes = analysis.types ? analysis.types : analysis.classes
  const details = data.image_details
-  let objectCount = ''
-  if (details.image_heap.objects) {
-    objectCount = `${details.image_heap.objects.count.toLocaleString()} objects, `
-  }
  const debugInfoBytes = details.debug_info ? details.debug_info.bytes : 0
  const otherBytes =
    details.total_bytes -
@@ -188,59 +171,12 @@ function createReport(data: BuildOutput): string {
      <td align="left"></td>
    </tr>`
  }
-  let versionLine
-  if (info.vendor_version) {
-    versionLine = `
-    <tr>
-      <td><a href="${DOCS_BASE}#glossary-java-info" target="_blank">Java version</a></td>
-      <td>${info.java_version}</td>
-      <td><a href="${DOCS_BASE}#glossary-java-info" target="_blank">Vendor version</a></td>
-      <td>${info.vendor_version}</td>
-    </tr>`
-  } else {
-    versionLine = `
-    <tr>
-      <td><a href="${DOCS_BASE}#glossary-version-info" target="_blank">GraalVM version</a></td>
-      <td>${info.graalvm_version}</td>
-      <td><a href="${DOCS_BASE}#glossary-java-version-info" target="_blank">Java version</a></td>
-      <td>${info.java_version}</td>
-    </tr>`
-  }
-  let graalLine
-  if (info.graal_compiler) {
-    let pgoSuffix = ''
-    const isOracleGraalVM =
-      info.vendor_version && info.vendor_version.includes('Oracle GraalVM')
-    if (isOracleGraalVM) {
-      const pgo = info.graal_compiler.pgo
-      const pgoText = pgo ? pgo.join('+') : 'off'
-      pgoSuffix = `, <a href="${DOCS_BASE}#recommendation-pgo" target="_blank">PGO</a>: ${pgoText}`
-    }
-    graalLine = `
-    <tr>
-      <td align="left"><a href="${DOCS_BASE}#glossary-graal-compiler" target="_blank">Graal compiler</a></td>
-      <td colspan="3">
-        optimization level: ${info.graal_compiler.optimization_level},
-        target machine: ${info.graal_compiler.march}${pgoSuffix}
-      </td>
-    </tr>`
-  }

  const resources = data.resource_usage

-  let totalTime = ''
-  let gcTotalTimeRatio = ''
-  if (resources.total_secs) {
-    totalTime = ` in ${secondsToHuman(resources.total_secs)}`
-    gcTotalTimeRatio = ` (${toPercent(
-      resources.garbage_collection.total_secs,
-      resources.total_secs
-    )} of total time)`
-  }
-
  return `## GraalVM Native Image Build Report

-\`${info.name}\` generated${totalTime} as part of the '${
+\`${info.name}\` generated as part of the '${
    context.job
  }' job in run <a href="${context.serverUrl}/${context.repo.owner}/${
    context.repo.repo
@@ -248,14 +184,18 @@ function createReport(data: BuildOutput): string {

 #### Environment

-<table>${versionLine}${graalLine}
+<table>
  <tr>
+    <td><a href="${DOCS_BASE}#glossary-version-info" target="_blank">GraalVM version</a></td>
+    <td>${info.graalvm_version}</td>
    <td><a href="${DOCS_BASE}#glossary-ccompiler" target="_blank">C compiler</a></td>
-    <td colspan="3">${info.c_compiler}</td>
+    <td>${info.c_compiler}</td>
  </tr>
  <tr>
+    <td><a href="${DOCS_BASE}#glossary-java-version-info" target="_blank">Java version</a></td>
+    <td>${info.java_version}</td>
    <td><a href="${DOCS_BASE}#glossary-gc" target="_blank">Garbage collector</a></td>
-    <td colspan="3">${info.garbage_collector}</td>
+    <td>${info.garbage_collector}</td>
  </tr>
 </table>

@@ -276,17 +216,17 @@ function createReport(data: BuildOutput): string {
  <tbody>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reachability" target="_blank">Reachable</a></td>
-      <td align="right">${analysisTypes.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.classes.reachable}</td>
      <td align="right">${toPercent(
-        analysisTypes.reachable,
-        analysisTypes.total
+        analysis.classes.reachable,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.fields.reachable}</td>
      <td align="right">${toPercent(
        analysis.fields.reachable,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.methods.reachable}</td>
      <td align="right">${toPercent(
        analysis.methods.reachable,
        analysis.methods.total
@@ -294,17 +234,17 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reflection-registrations" target="_blank">Reflection</a></td>
-      <td align="right">${analysisTypes.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.classes.reflection}</td>
      <td align="right">${toPercent(
-        analysisTypes.reflection,
-        analysisTypes.total
+        analysis.classes.reflection,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.fields.reflection}</td>
      <td align="right">${toPercent(
        analysis.fields.reflection,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.methods.reflection}</td>
      <td align="right">${toPercent(
        analysis.methods.reflection,
        analysis.methods.total
@@ -312,17 +252,17 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-jni-access-registrations" target="_blank">JNI</a></td>
-      <td align="right">${analysisTypes.jni.toLocaleString()}</td>
+      <td align="right">${analysis.classes.jni}</td>
      <td align="right">${toPercent(
-        analysisTypes.jni,
-        analysisTypes.total
+        analysis.classes.jni,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.jni.toLocaleString()}</td>
+      <td align="right">${analysis.fields.jni}</td>
      <td align="right">${toPercent(
        analysis.fields.jni,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.jni.toLocaleString()}</td>
+      <td align="right">${analysis.methods.jni}</td>
      <td align="right">${toPercent(
        analysis.methods.jni,
        analysis.methods.total
@@ -330,11 +270,11 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reachability" target="_blank">Loaded</a></td>
-      <td align="right">${analysisTypes.total.toLocaleString()}</td>
+      <td align="right">${analysis.classes.total}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.fields.total.toLocaleString()}</td>
+      <td align="right">${analysis.fields.total}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.methods.total.toLocaleString()}</td>
+      <td align="right">${analysis.methods.total}</td>
      <td align="right">100.000%</td>
    </tr>
  </tbody>
@@ -359,7 +299,9 @@ function createReport(data: BuildOutput): string {
        details.code_area.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${details.code_area.compilation_units.toLocaleString()} compilation units</td>
+      <td align="left">${
+        details.code_area.compilation_units
+      } compilation units</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-image-heap" target="_blank">Image heap</a></td>
@@ -368,9 +310,9 @@ function createReport(data: BuildOutput): string {
        details.image_heap.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${objectCount}${bytesToHuman(
-    details.image_heap.resources.bytes
-  )} for ${details.image_heap.resources.count.toLocaleString()} resources</td>
+      <td align="left">${bytesToHuman(
+        details.image_heap.resources.bytes
+      )} for ${details.image_heap.resources.count} resources</td>
    </tr>${debugInfoLine}
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-other-data" target="_blank">Other data</a></td>
@@ -397,7 +339,7 @@ function createReport(data: BuildOutput): string {
      <td align="left"><a href="${DOCS_BASE}#glossary-garbage-collections" target="_blank">Garbage collection</a></td>
      <td align="left">${resources.garbage_collection.total_secs.toFixed(
        2
-      )}s${gcTotalTimeRatio} in ${resources.garbage_collection.count} GCs</td>
+      )}s in ${resources.garbage_collection.count} GCs</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-peak-rss" target="_blank">Peak RSS</a></td>
@@ -436,11 +378,3 @@ function bytesToHuman(bytes: number): string {
    return `${(bytes / BYTES_TO_GiB).toFixed(2)}GB`
  }
 }
-
-function secondsToHuman(seconds: number): string {
-  if (seconds < 60) {
-    return `${seconds.toFixed(1)}s`
-  } else {
-    return `${Math.trunc(seconds / 60)}m ${Math.trunc(seconds % 60)}s`
-  }
-}
--- a/src/gds.ts
+++ b/src/gds.ts
@@ -32,7 +32,7 @@ export async function downloadGraalVMEELegacy(
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/1.1.2 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const userAgent = `GraalVMGitHubAction/1.1.0 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
  const baseArtifact = await fetchArtifact(
    userAgent,
    'isBase:True',
@@ -70,11 +70,7 @@ export async function fetchArtifact(
    await response.readBody()
  ) as GDSArtifactsResponse
  if (artifactResponse.items.length !== 1) {
-    throw new Error(
-      artifactResponse.items.length > 1
-        ? `Found more than one GDS artifact. ${c.ERROR_HINT}`
-        : `Unable to find GDS artifact. Are you sure version: '${version}' is correct?`
-    )
+    throw new Error(`Found more than one GDS artifact`)
  }
  return artifactResponse.items[0]
 }
--- a/src/graalvm.ts
+++ b/src/graalvm.ts
@@ -160,11 +160,11 @@ export function findHighestJavaVersion(

 // Support for GraalVM 22.X releases and earlier

-export async function setUpGraalVMLatest_22_X(
+export async function setUpGraalVMLatest(
  gdsToken: string,
  javaVersion: string
 ): Promise<string> {
-  const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.2'
+  const lockedVersion = '22.3.1'
  if (gdsToken.length > 0) {
    return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion)
  }
--- a/src/main.ts
+++ b/src/main.ts
@@ -38,11 +38,9 @@ async function run(): Promise<void> {
      await setUpNativeImageMusl()
    }

-    // Download GraalVM JDK
-    const isGraalVMforJDK17OrLater =
-      distribution.length > 0 || graalvmVersion.length == 0
+    // Download or build GraalVM
    let graalVMHome
-    if (isGraalVMforJDK17OrLater) {
+    if (distribution.length > 0 || graalvmVersion.length == 0) {
      switch (distribution) {
        case c.DISTRIBUTION_GRAALVM:
          graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
@@ -51,14 +49,9 @@ async function run(): Promise<void> {
          graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
          break
        case c.DISTRIBUTION_MANDREL:
-          if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
-            graalVMHome = await setUpMandrel(graalvmVersion, javaVersion)
-          } else {
-            throw new Error(
-              `Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
-            )
-          }
-          break
+          throw new Error(
+            `Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
+          )
        case '':
          if (javaVersion === c.VERSION_DEV) {
            core.info(
@@ -71,7 +64,6 @@ async function run(): Promise<void> {
            )
            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          }
-          break
        default:
          throw new Error(`Unsupported distribution: ${distribution}`)
      }
@@ -87,7 +79,7 @@ async function run(): Promise<void> {
            )
            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          } else {
-            graalVMHome = await graalvm.setUpGraalVMLatest_22_X(
+            graalVMHome = await graalvm.setUpGraalVMLatest(
              gdsToken,
              javaVersion
            )
@@ -140,7 +132,7 @@ async function run(): Promise<void> {
    if (cache && isCacheAvailable()) {
      await restore(cache)
    }
-    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalvmVersion)
+    setUpNativeImageBuildReports(graalvmVersion)
  } catch (error) {
    if (error instanceof Error) core.setFailed(error.message)
  }
Author	SHA1	Message	Date
Fabio Niephaus	52b9a9b316	Bump version to `1.1.0`.	2023-06-16 13:04:28 +02:00
Fabio Niephaus	435d2b356f	Incorporate additional feedback.	2023-06-16 13:03:32 +02:00
Fabio Niephaus	6bd874f0ca	Incorporate more reviewer feedback.	2023-06-16 12:15:03 +02:00
Fabio Niephaus	be3e4f6272	Incorporate reviewer feedback.	2023-06-16 10:34:13 +02:00
Fabio Niephaus	fc45baf59f	Support new GraalVM for JDK17/JDK20 release This commit adds support for the new GraalVM for JDK17/JDK20 release, including the new Oracle GraalVM distribution. For this, users only need to specify the 'java-version' option and the new 'distribution' option. The 'version' option is now marked as optional and kept for compatibility with older GraalVM releases and Mandrel.	2023-06-16 09:19:49 +02:00
Fabio Niephaus	17d64df2bb	Temporarily disable Mandrel latest builds on Windows.	2023-06-15 17:59:26 +02:00