Get latest mandrel release if version not specified

Update doc.
Remove user-agent from HttpClient
2023-11-03 13:30:38 +01:00 · 2023-11-03 13:30:38 +01:00 · 2023-11-03 13:12:28 +01:00 · 2023-11-03 13:01:11 +01:00 · 2023-11-03 12:36:12 +01:00 · 2023-11-03 12:07:47 +01:00
21 changed files with 18359 additions and 24128 deletions
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -24,7 +24,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Set Node.js 16.x
        uses: actions/setup-node@v3
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,25 +15,82 @@ jobs:
  build: # make sure build/ci work properly
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - run: |
          npm install
      - run: |
          npm run all
+  test:
+    name: GraalVM
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java-version: ['21', '17', '20', 'dev']
+        distribution: ['graalvm', 'graalvm-community']
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        components: ['']
+        include:
+          - java-version: '21'
+            distribution: ''
+            os: ubuntu-latest
+          - java-version: 'dev'
+            distribution: ''
+            os: windows-latest
+          - java-version: '21'
+            distribution: 'graalvm-community'
+            os: ubuntu-latest
+            components: 'native-image' # should print a warning but not fail
+          - java-version: '21.0.0' # test for GA version (see #63)
+            distribution: 'graalvm'
+            os: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run setup-graalvm action
+        uses: ./
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: ${{ matrix.distribution }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: ${{ matrix.components }}
+      - name: Check environment
+        run: |
+          echo "GRAALVM_HOME: $GRAALVM_HOME"
+          if [[ "${{ matrix.java-version }}" == "dev" ]]; then
+            [[ "$GRAALVM_HOME" == *"$RUNNER_TEMP"* ]] || exit 12
+          else
+            [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
+          fi
+          echo "JAVA_HOME: $JAVA_HOME"
+          java --version
+          java --version | grep "GraalVM" || exit 34
+          native-image --version
+        if: runner.os != 'Windows'
+      - name: Check Windows environment
+        run: |
+          echo "GRAALVM_HOME: $env:GRAALVM_HOME"
+          echo "JAVA_HOME: $env:JAVA_HOME"
+          java --version
+          native-image --version
  test-ce: # make sure the action works on a clean machine without building
+    needs: test  
    name: CE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        version: [latest, dev]
-        java-version: ['19']
+        version: ['latest', 'dev']
+        java-version: ['17', '20']
        components: ['native-image']
        os: [macos-latest, windows-latest, ubuntu-latest]
+        exclude:
+          - version: 'latest'
+            java-version: '20'
+          - version: 'dev'
+            java-version: '19'
        include:
          - version: '22.2.0' # for update notifications
            java-version: '17'
            components: 'native-image'
-            os: ubuntu-18.04
+            os: ubuntu-20.04
          - version: '22.3.1'
            java-version: '11' # for JDK11 notification
            components: 'native-image'
@@ -47,7 +104,7 @@ jobs:
            components: 'native-image'
            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -58,16 +115,18 @@ jobs:
      - name: Check environment
        run: |
          echo "GRAALVM_HOME: $GRAALVM_HOME"
-          if [[ "${{ matrix.version }}" == "dev" ]]; then
+          if [[ "${{ matrix.version }}" == "dev" ]] && [[ "${{ matrix.java-version }}" == "dev" ]]; then
            [[ "$GRAALVM_HOME" == *"$RUNNER_TEMP"* ]] || exit 12
          else
            [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
          fi
          echo "JAVA_HOME: $JAVA_HOME"
          java --version
-          java --version | grep "GraalVM CE" || exit 34
+          java --version | grep "GraalVM" || exit 34
          native-image --version
-          gu remove native-image
+          if [[ "${{ matrix.java-version }}" != "dev" ]]; then
+            gu list
+          fi
        if: runner.os != 'Windows'
      - name: Check Windows environment
        run: |
@@ -78,26 +137,27 @@ jobs:
          gu.cmd remove native-image
        if: runner.os == 'Windows'
  test-ee:
+    needs: test
    name: EE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
    if: github.event_name != 'pull_request'
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        version: ['latest']
-        java-version: ['19']
+        java-version: ['17']
        components: ['native-image']
        os: [macos-latest, windows-latest, ubuntu-latest]
        include:
-          - version: '22.3.0'
+          - version: '22.3.3'
            java-version: '11'
            components: 'native-image'
            os: ubuntu-latest
-          - version: '22.3.0'
+          - version: '22.3.3'
            java-version: '17'
            components: 'native-image'
            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -112,9 +172,9 @@ jobs:
          [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
          echo "JAVA_HOME: $JAVA_HOME"
          java --version
-          java --version | grep "GraalVM EE" || exit 23
+          java --version | grep -e "GraalVM EE" -e "Oracle GraalVM" || exit 23
          native-image --version
-          gu remove native-image
+          gu list
        if: runner.os != 'Windows'
      - name: Check Windows environment
        run: |
@@ -125,19 +185,31 @@ jobs:
          gu.cmd remove native-image
        if: runner.os == 'Windows'
  test-mandrel:
+    needs: test
    name: ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        version: ['mandrel-22.2.0.0-Final', 'mandrel-latest']
+        version: ['mandrel-22.2.0.0-Final', '23.0.1.2-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
+          - version: '' # test with no version
+            java-version: '21'
+            distribution: 'mandrel'
+            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
          version: ${{ matrix.version }}
+          distribution: ${{ matrix.distribution }}
          java-version: ${{ matrix.java-version }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Check environment
@@ -146,6 +218,7 @@ 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
@@ -155,20 +228,41 @@ jobs:
          java --version
          native-image --version
        if: runner.os == 'Windows'
-  test-native-image-msvc:
+  test-native-image-windows:
    name: native-image on windows-latest
    runs-on: windows-latest
    permissions:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Run setup-graalvm action
+        uses: ./
+        with:
+          java-version: 'dev'
+          distribution: 'graalvm-community'
+          native-image-job-reports: 'true'
+          native-image-pr-reports: 'true'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build HelloWorld executable with GraalVM Native Image on Windows
+        run: |
+          echo 'public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, World!"); } }' > HelloWorld.java
+          javac HelloWorld.java
+          native-image HelloWorld
+          ./helloworld
+  test-native-image-windows-msvc:
+    name: native-image on windows-2022
+    runs-on: windows-2022
+    permissions:
+      contents: read
+      pull-requests: write # for `native-image-pr-reports` option
+    steps:
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
-          version: 'latest'
          java-version: '17'
-          components: 'native-image'
+          distribution: 'graalvm'
          native-image-job-reports: 'true'
          native-image-pr-reports: 'true'
          github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -185,13 +279,12 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
-          version: 'dev'
          java-version: 'dev'
-          components: 'native-image'
+          distribution: 'graalvm-community'
          native-image-musl: 'true'
          native-image-job-reports: 'true'
          native-image-pr-reports: 'true'
@@ -209,13 +302,13 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
        uses: ./
        with:
-          version: 'latest'
-          java-version: '17'
-          components: 'espresso,llvm-toolchain,native-image,nodejs,python,R,ruby,wasm'
+          java-version: '17.0.8'
+          distribution: 'graalvm'
+          components: 'espresso,llvm-toolchain,native-image,nodejs,python,ruby,wasm'
          set-java-home: 'false'
          native-image-job-reports: 'true'
          native-image-pr-reports: 'true'
@@ -236,8 +329,6 @@ jobs:
          [[ $(which node) == *"graalvm"* ]] || exit 45
          node --version
          graalpy --version
-          [[ $(which R) == *"graalvm"* ]] || exit 56
-          R --version
          truffleruby --version
          wasm --version
      - name: Build HelloWorld.java with GraalVM Native Image
@@ -246,16 +337,16 @@ jobs:
          javac HelloWorld.java
          native-image -g HelloWorld
          ./helloworld
-      - name: Build Ruby-FFI with TruffleRuby
-        run: |
-          [[ $(which bundle) == *"graalvm"* ]] || exit 57
-          git clone --depth 1 https://github.com/ffi/ffi.git
-          pushd ffi > /dev/null
-          # https://github.com/ffi/ffi/blob/447845cb3030194c79700c86fb388a12e6f81386/.github/workflows/ci.yml#L58-L62
-          bundle install
-          bundle exec rake libffi
-          bundle exec rake compile
-          bundle exec rake test
-          popd > /dev/null
+      # - name: Build Ruby-FFI with TruffleRuby
+      #   run: |
+      #     [[ $(which bundle) == *"graalvm"* ]] || exit 57
+      #     git clone --depth 1 https://github.com/ffi/ffi.git
+      #     pushd ffi > /dev/null
+      #     # https://github.com/ffi/ffi/blob/447845cb3030194c79700c86fb388a12e6f81386/.github/workflows/ci.yml#L58-L62
+      #     bundle install
+      #     bundle exec rake libffi
+      #     bundle exec rake compile
+      #     bundle exec rake test
+      #     popd > /dev/null
      - name: Remove components
-        run: gu remove espresso llvm-toolchain native-image nodejs python R ruby wasm
+        run: gu remove espresso llvm-toolchain nodejs python ruby wasm
--- a/README.md
+++ b/README.md
@@ -1,18 +1,46 @@
 # GitHub Action for GraalVM [![build-test](https://github.com/graalvm/setup-graalvm/actions/workflows/test.yml/badge.svg)](https://github.com/graalvm/setup-graalvm/actions/workflows/test.yml)
-This GitHub action sets up GraalVM [Community Edition (CE)][repo] or [Enterprise Edition (EE)][graalvm-ee] as well as GraalVM components such as [Native Image][native-image] and [Truffle languages][truffle-languages].
+This GitHub action sets up [Oracle GraalVM][graalvm-medium], GraalVM [Community Edition (CE)][repo], [Enterprise Edition (EE)][graalvm-ee], or [Mandrel][mandrel], as well as [Native Image][native-image] and GraalVM components such as [Truffle languages][truffle-languages].

 ## Key Features

 This action:

- supports GraalVM Community Edition (CE) [releases], [dev builds][dev-builds], GraalVM Enterprise Edition (EE) [releases][graalvm-ee] (set [`gds-token`](#options)) 22.1.0 and later, and [Mandrel][mandrel] (see [options](#options))
- has built-in support for GraalVM components and the [GraalVM Updater][gu]
+- supports Oracle GraalVM [releases][graalvm-dl], GraalVM Community Edition (CE) [releases], [dev builds][dev-builds], GraalVM Enterprise Edition (EE) [releases][graalvm-ee] (set [`gds-token`](#options)) 22.1.0 and later, and [Mandrel][mandrel] (see [Options](#options))
 - exports a `$GRAALVM_HOME` environment variable
- adds `$GRAALVM_HOME/bin` to the `$PATH` environment variable<br>(Truffle languages and tools can be invoked directly)
- sets `$JAVA_HOME` to `$GRAALVM_HOME` by default<br>(can be disabled via `set-java-home: 'false'`, see [options](#options))
- supports `amd64` and `aarch64` (selected automatically, `aarch64` requires a [self-hosted runner][gha-self-hosted-runners])
- sets up Windows environments with build tools using [vcvarsall.bat][vcvarsall]
+- adds `$GRAALVM_HOME/bin` to the `$PATH` environment variable<br>(Native Image, Truffle languages, and tools can be invoked directly)
+- sets `$JAVA_HOME` to `$GRAALVM_HOME` by default<br>(can be disabled via `set-java-home: 'false'`, see [Options](#options))
+- supports `x64` and `aarch64` (selected automatically, `aarch64` requires a [self-hosted runner][gha-self-hosted-runners])
 - supports dependency caching for Apache Maven, Gradle, and sbt (see [`cache` option](#options))
+- sets up Windows environments with build tools using [vcvarsall.bat][vcvarsall]
+- has built-in support for GraalVM components and the [GraalVM Updater][gu]
+
+
+## Migrating from GraalVM 22.3 or Earlier to the New GraalVM for JDK 17 and Later
+
+The [GraalVM for JDK 17 and JDK 20 release](https://medium.com/graalvm/a-new-graalvm-release-and-new-free-license-4aab483692f5) aligns the GraalVM version scheme with OpenJDK.
+As a result, this action no longer requires the `version` option to select a specific GraalVM version.
+At the same time, it introduces a new `distribution` option to select a specific GraalVM distribution (`graalvm`, `graalvm-community`, or `mandrel`).
+Therefore, to migrate your workflow to use the latest GraalVM release, replace the `version` with the `distribution` option in the workflow `yml` config, for example:
+
+```yml
+# ...
+- uses: graalvm/setup-graalvm@v1
+  with:
+    java-version: '17'
+    version: '22.3.2' # Old 'version' option for the GraalVM version
+    # ...
+```
+
+can be replaced with:
+
+```yml
+# ...
+- uses: graalvm/setup-graalvm@v1
+  with:
+    java-version: '17.0.7' # for a specific JDK 17; or '17' for the latest JDK 17
+    distribution: 'graalvm' # New 'distribution' option
+    # ...
+```


 ## Templates
@@ -20,26 +48,28 @@ This action:
 ### Quickstart Template

 ```yml
-name: GraalVM Community Edition build
+name: GraalVM build
 on: [push, pull_request]
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: graalvm/setup-graalvm@v1
        with:
-          version: 'latest'
-          java-version: '17'
-          components: 'native-image'
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Example step
        run: |
          echo "GRAALVM_HOME: $GRAALVM_HOME"
          echo "JAVA_HOME: $JAVA_HOME"
          java --version
-          gu --version
          native-image --version
+      - name: Example step using Maven plugin  # https://graalvm.github.io/native-build-tools/latest/maven-plugin.html
+        run: mvn -Pnative package
+      - name: Example step using Gradle plugin # https://graalvm.github.io/native-build-tools/latest/gradle-plugin.html
+        run: gradlew nativeCompile
 ```

 ### Building a HelloWorld with GraalVM Native Image on Different Platforms
@@ -55,13 +85,12 @@ jobs:
      matrix:
        os: [macos-latest, windows-latest, ubuntu-latest]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - uses: graalvm/setup-graalvm@v1
        with:
-          version: '22.3.0'
-          java-version: '17'
-          components: 'native-image'
+          java-version: '21'
+          distribution: 'graalvm'
          github-token: ${{ secrets.GITHUB_TOKEN }}
          native-image-job-reports: 'true'

@@ -79,7 +108,29 @@ jobs:
          path: helloworld*
 ```

-### Basic GraalVM Enterprise Edition Template
+<details>
+<summary><h4>Template for older GraalVM releases</h4></summary>
+
+```yml
+name: GraalVM build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: '22.3.2' # GraalVM version
+          java-version: '17'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+```
+
+</details>
+
+<details>
+<summary><h4>Template for GraalVM Enterprise Edition</h4></summary>

 #### Prerequisites

@@ -95,7 +146,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: graalvm/setup-graalvm@v1
        with:
          version: '22.3.0'
@@ -109,22 +160,24 @@ jobs:
          native-image --version
 ```

+</details>

 ## Options

 | Name            | Default  | Description |
 |-----------------|:--------:|-------------|
-| `version`<br>*(required)* | n/a | `X.Y.Z` (e.g., `22.3.0`) for a specific [GraalVM release][releases]<br>`latest` for [latest stable release][stable],<br>`dev` for [latest dev build][dev-build],<br>`mandrel-X.Y.Z` (e.g., `mandrel-21.3.0.0-Final`) for a specific [Mandrel release][mandrel-releases],<br>`mandrel-latest` for [latest Mandrel stable release][mandrel-stable]. |
-| `gds-token`     | `''`     | Download token for the GraalVM Download Service. If a non-empty token is provided, the action will set up GraalVM Enterprise Edition (see [GraalVM EE template](#basic-graalvm-enterprise-edition-template)). |
-| `java-version`<br>*(required)* | n/a | `'17'` or `'19'` for a specific Java version, `'dev'` for the highest Java version available (requires `version: 'dev'`).<br>(`'8'`, `'11'`, `'16'` are supported for older GraalVM releases.) |
-| `components`    | `''`     | Comma-spearated list of GraalVM components (e.g., `native-image` or `ruby,nodejs`) that will be installed by the [GraalVM Updater][gu]. |
-| `github-token`  | `''`     | Token for communication with the GitHub API. Please set to `${{ secrets.GITHUB_TOKEN }}` (see [templates](#templates)) to allow the action to authenticate with the GitHub API, which helps to reduce rate limiting issues. |
+| `java-version`<br>*(required)* | n/a | `'21'` or `'17.0.7'` for a specific Java version, `'dev'` for a dev build with the latest Java version available.<br>(`'8'`, `'11'`, `'16'`, `'19'` are supported for older GraalVM releases.) |
+| `distribution`  | `''` | GraalVM distribution (`graalvm` for Oracle GraalVM, `graalvm-community` for GraalVM Community Edition, `mandrel` for Mandrel). |
+| `github-token`  | `'${{ github.token }}'` | Token for communication with the GitHub API. Please set this to `${{ secrets.GITHUB_TOKEN }}` (see [templates](#templates)) to allow the action to authenticate with the GitHub API, which helps reduce rate-limiting issues. |
 | `set-java-home` | `'true'` | If set to `'true'`, instructs the action to set `$JAVA_HOME` to the path of the GraalVM installation. Overrides any previous action or command that sets `$JAVA_HOME`. |
-| `cache`         | `''`     | Name of the build platform to cache dependencies. It can be `'maven'`, `'gradle'`, or `'sbt'` and works the same way as described in [actions/setup-java][setup-java-caching]. |
-| `check-for-updates` | `'true'`  | [Annotate jobs][gha-annotations] with update notifications, for example, when a new GraalVM release is available. |
+| `cache`         | `''`     | Name of the build platform to cache dependencies. Turned off by default (`''`). It can also be `'maven'`, `'gradle'`, or `'sbt'` and works the same way as described in [actions/setup-java][setup-java-caching]. |
+| `check-for-updates` | `'true'`  | [Annotate jobs][gha-annotations] with update notifications, for example when a new GraalVM release is available. |
 | `native-image-musl` | `'false'` | If set to `'true'`, sets up [musl] to build [static binaries][native-image-static] with GraalVM Native Image *(Linux only)*. [Example usage][native-image-musl-build] (be sure to replace `uses: ./` with `uses: graalvm/setup-graalvm@v1`). |
 | `native-image-job-reports` *) | `'false'` | If set to `'true'`, post a job summary containing a Native Image build report. |
 | `native-image-pr-reports`  *) | `'false'` | If set to `'true'`, post a comment containing a Native Image build report on pull requests. Requires `write` permissions for the [`pull-requests` scope][gha-permissions]. |
+| `components`    | `''`     | Comma-separated list of GraalVM components (e.g., `native-image` or `ruby,nodejs`) that will be installed by the [GraalVM Updater][gu]. |
+| `version` | `''` | `X.Y.Z` (e.g., `22.3.0`) for a specific [GraalVM release][releases] up to `22.3.2`<br>`mandrel-X.Y.Z.W` or `X.Y.Z.W-Final` (e.g., `mandrel-21.3.0.0-Final` or `21.3.0.0-Final`) for a specific [Mandrel release][mandrel-releases],<br>`mandrel-latest` or `latest` for the latest Mandrel stable release. |
+| `gds-token`     | `''`     | Download token for the GraalVM Download Service. If a non-empty token is provided, the action will set up GraalVM Enterprise Edition (see [GraalVM EE template](#template-for-graalvm-enterprise-edition)). |

 **) Make sure that Native Image is used only once per build job. Otherwise, the report is only generated for the last Native Image build.*

@@ -143,6 +196,9 @@ Only pull requests from committers that can be verified as having signed the OCA
 [gha-secrets]: https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository
 [gha-self-hosted-runners]: https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners
 [gu]: https://www.graalvm.org/reference-manual/graalvm-updater/
+[graalvm]: https://www.graalvm.org/
+[graalvm-dl]: https://www.oracle.com/java/technologies/downloads/
+[graalvm-medium]: https://medium.com/graalvm/a-new-graalvm-release-and-new-free-license-4aab483692f5
 [graalvm-ee]: https://www.oracle.com/downloads/graalvm-downloads.html
 [mandrel]: https://github.com/graalvm/mandrel
 [mandrel-releases]: https://github.com/graalvm/mandrel/releases
--- a/tests/gds.test.ts
+++ b/tests/gds.test.ts
@@ -1,5 +1,5 @@
 import * as path from 'path'
-import {downloadGraalVMEE, fetchArtifact} from '../src/gds'
+import {downloadGraalVMEELegacy, fetchArtifact} from '../src/gds'
 import {expect, test} from '@jest/globals'

 const TEST_USER_AGENT = 'GraalVMGitHubActionTest/1.0.4'
@@ -32,13 +32,15 @@ test('fetch artifacts', async () => {
 })

 test('errors when downloading artifacts', async () => {
-  await expect(downloadGraalVMEE('invalid', '22.1.0', '11')).rejects.toThrow(
+  await expect(
+    downloadGraalVMEELegacy('invalid', '22.1.0', '11')
+  ).rejects.toThrow(
    'The provided "gds-token" was rejected (reason: "Invalid download token", opc-request-id: /'
  )
-  await expect(downloadGraalVMEE('invalid', '1.0.0', '11')).rejects.toThrow(
-    'Unable to find JDK11-based GraalVM EE 1.0.0'
-  )
-  await expect(downloadGraalVMEE('invalid', '22.1.0', '1')).rejects.toThrow(
-    'Unable to find JDK1-based GraalVM EE 22.1.0'
-  )
+  await expect(
+    downloadGraalVMEELegacy('invalid', '1.0.0', '11')
+  ).rejects.toThrow('Unable to find JDK11-based GraalVM EE 1.0.0')
+  await expect(
+    downloadGraalVMEELegacy('invalid', '22.1.0', '1')
+  ).rejects.toThrow('Unable to find JDK1-based GraalVM EE 22.1.0')
 })
--- a/tests/graalvm.test.ts
+++ b/tests/graalvm.test.ts
@@ -1,7 +1,7 @@
 import * as path from 'path'
 import * as graalvm from '../src/graalvm'
 import {expect, test} from '@jest/globals'
-import {getLatestRelease} from '../src/utils'
+import {getTaggedRelease} from '../src/utils'
 import {findGraalVMVersion, findHighestJavaVersion} from '../src/graalvm'
 import {GRAALVM_RELEASES_REPO} from '../src/constants'

@@ -18,6 +18,9 @@ test('request invalid version/javaVersion', async () => {
    try {
      await graalvm.setUpGraalVMRelease('', combination[0], combination[1])
    } catch (err) {
+      if (!(err instanceof Error)) {
+        fail(`Unexpected non-Error: ${err}`)
+      }
      error = err
    }

@@ -28,17 +31,40 @@ test('request invalid version/javaVersion', async () => {
 })

 test('find version/javaVersion', async () => {
-  const latestRelease = await getLatestRelease(GRAALVM_RELEASES_REPO)
+  // Make sure the action can find the latest Java version for known major versions
+  for (var majorJavaVersion of ['17', '20']) {
+    await graalvm.findLatestGraalVMJDKCEJavaVersion(majorJavaVersion)
+  }
+
+  let error = new Error('unexpected')
+  try {
+    await graalvm.findLatestGraalVMJDKCEJavaVersion('11')
+    fail('Should not find Java version for 11')
+  } catch (err) {
+    if (!(err instanceof Error)) {
+      fail(`Unexpected non-Error: ${err}`)
+    }
+    error = err
+  }
+  expect(error.message).toContain('Unable to find the latest Java version for')
+
+  const latestRelease = await getTaggedRelease(
+    GRAALVM_RELEASES_REPO,
+    'vm-22.3.1'
+  )
  const latestVersion = findGraalVMVersion(latestRelease)
  expect(latestVersion).not.toBe('')
  const latestJavaVersion = findHighestJavaVersion(latestRelease, latestVersion)
  expect(latestJavaVersion).not.toBe('')

-  let error = new Error('unexpected')
+  error = new Error('unexpected')
  try {
    const invalidRelease = {...latestRelease, tag_name: 'invalid'}
    findGraalVMVersion(invalidRelease)
  } catch (err) {
+    if (!(err instanceof Error)) {
+      fail(`Unexpected non-Error: ${err}`)
+    }
    error = err
  }
  expect(error.message).toContain('Could not find latest GraalVM release:')
@@ -46,6 +72,9 @@ test('find version/javaVersion', async () => {
  try {
    findHighestJavaVersion(latestRelease, 'invalid')
  } catch (err) {
+    if (!(err instanceof Error)) {
+      fail(`Unexpected non-Error: ${err}`)
+    }
    error = err
  }
  expect(error.message).toContain('Could not find highest Java version.')
--- a/tests/mandrel.test.ts
+++ b/tests/mandrel.test.ts
@@ -0,0 +1,75 @@
+import * as path from 'path'
+import * as mandrel from '../src/mandrel'
+import {expect, test} from '@jest/globals'
+import {getLatestRelease} from '../src/utils'
+
+process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
+process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')
+
+test('request invalid version/javaVersion combination', async () => {
+  for (var combination of [
+    ['mandrel-23.1.1.0-Final', '17'],
+    ['mandrel-23.0.2.1-Final', '21']
+  ]) {
+    let error = new Error('unexpected')
+    try {
+      await mandrel.setUpMandrel(combination[0], combination[1])
+    } catch (err) {
+      if (!(err instanceof Error)) {
+        fail(`Unexpected non-Error: ${err}`)
+      }
+      error = err
+    }
+
+    expect(error).not.toBeUndefined()
+    expect(error.message).toContain('Failed to download')
+    expect(error.message).toContain('Are you sure version')
+  }
+})
+test('request invalid version', async () => {
+  for (var combination of [
+    ['mandrel-23.1.1.0', '21'],
+    ['mandrel-23.0.2.1', '17']
+  ]) {
+    let error = new Error('unexpected')
+    try {
+      await mandrel.setUpMandrel(combination[0], combination[1])
+    } catch (err) {
+      if (!(err instanceof Error)) {
+        fail(`Unexpected non-Error: ${err}`)
+      }
+      error = err
+    }
+
+    expect(error).not.toBeUndefined()
+    expect(error.message).toContain('Failed to download')
+    expect(error.message).toContain('Are you sure version')
+  }
+})
+
+test('find latest', async () => {
+  // Make sure the action can find the latest Mandrel release
+  const latestRelease = await getLatestRelease(mandrel.MANDREL_REPO)
+  const tag_name = latestRelease.tag_name
+  expect(tag_name).toContain(mandrel.MANDREL_TAG_PREFIX)
+})
+
+test('get known latest Mandrel for specific JDK', async () => {
+  // Test deprecated versions that won't get updates anymore
+  for (var combination of [
+    ['11', '22.2.0.0-Final'],
+    ['20', '23.0.1.2-Final']
+  ]) {
+    const latest = await mandrel.getLatestMandrelReleaseUrl(combination[0])
+    expect(latest).toContain(`mandrel-java${combination[0]}`)
+    expect(latest).toContain(combination[1])
+  }
+})
+
+test('get latest Mandrel for specific JDK', async () => {
+  // Test supported versions
+  for (var javaVersion of ['17', '21']) {
+    const latest = await mandrel.getLatestMandrelReleaseUrl(javaVersion)
+    expect(latest).toContain(`mandrel-java${javaVersion}`)
+  }
+})
--- a/action.yml
+++ b/action.yml
@@ -1,27 +1,25 @@
 name: 'GitHub Action for GraalVM'
-description: 'Set up a specific version of GraalVM Community Edition (CE) or Enterprise Edition (EE)'
+description: 'Set up a specific version of the GraalVM JDK and add the command-line tools to the PATH'
 author: 'GraalVM Community'
 branding:
  icon: 'terminal'  
  color: 'blue'
 inputs:
-  version:
-    required: true
-    description: 'GraalVM version (release, latest, dev).'
-  gds-token:
-    required: false
-    description: 'Download token for the GraalVM Download Service. If provided, the action will set up GraalVM Enterprise Edition.'
  java-version:
    required: true
-    description: 'Java version (11 or 17, 8 or 16 for older releases).'
+    description: 'Java version. See examples of supported syntax in the README file.'
+  distribution:
+    description: 'GraalVM distribution. See the list of available distributions in the README file.'
+    required: false
+    default: ''
  components:
    required: false
    description: 'Comma-separated list of GraalVM components to be installed.'
    default: ''
  github-token:
    required: false
-    description: 'Set it to secrets.GITHUB_TOKEN to increase rate limits when accessing the GitHub API.'
-    default: ''
+    description: 'Set it to secrets.GITHUB_TOKEN to increase rate limits when accessing the GitHub API. Defaults to github.token.'
+    default: ${{ github.token }}
  set-java-home:
    required: false
    description: 'Set $JAVA_HOME to the GraalVM installation. Default: true.'
@@ -45,6 +43,13 @@ inputs:
    required: false
    description: 'Post a comment containing a Native Image build report on pull requests.'
    default: 'false'
+  version:
+    required: false
+    description: 'GraalVM version (release, latest, dev).'
+    default: ''
+  gds-token:
+    required: false
+    description: 'Download token for the GraalVM Download Service. If provided, the action will set up GraalVM Enterprise Edition.'
 outputs:
  cache-hit:
    description: 'A boolean value to indicate an exact match was found for the primary key'
--- 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
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "setup-graalvm",
-  "version": "1.0.10",
+  "version": "1.1.5",
  "private": true,
  "description": "GitHub Action for GraalVM",
  "main": "lib/main.js",
@@ -37,12 +37,12 @@
    "@actions/tool-cache": "^1.7.1",
    "@octokit/core": "^3.5.1",
    "@octokit/types": "^6.34.0",
-    "semver": "^7.3.8",
+    "semver": "^7.5.2",
    "uuid": "^8.3.2"
  },
  "devDependencies": {
    "@types/jest": "^27.5.2",
-    "@types/node": "^17.0.6",
+    "@types/node": "^18.15.11",
    "@types/semver": "^7.3.13",
    "@types/uuid": "^8.3.4",
    "@typescript-eslint/parser": "^5.8.1",
@@ -50,10 +50,10 @@
    "eslint": "^8.6.0",
    "eslint-plugin-github": "^4.3.5",
    "eslint-plugin-jest": "^25.3.4",
-    "jest": "^27.4.5",
+    "jest": "^29.5.0",
    "js-yaml": "^4.1.0",
    "prettier": "2.5.1",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.2.3"
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.0.4"
  }
 }
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -3,6 +3,7 @@ import * as otypes from '@octokit/types'
 export const INPUT_VERSION = 'version'
 export const INPUT_GDS_TOKEN = 'gds-token'
 export const INPUT_JAVA_VERSION = 'java-version'
+export const INPUT_DISTRIBUTION = 'distribution'
 export const INPUT_COMPONENTS = 'components'
 export const INPUT_GITHUB_TOKEN = 'github-token'
 export const INPUT_SET_JAVA_HOME = 'set-java-home'
@@ -14,15 +15,22 @@ export const IS_LINUX = process.platform === 'linux'
 export const IS_MACOS = process.platform === 'darwin'
 export const IS_WINDOWS = process.platform === 'win32'

+export const DISTRIBUTION_GRAALVM = 'graalvm'
+export const DISTRIBUTION_GRAALVM_COMMUNITY = 'graalvm-community'
+export const DISTRIBUTION_MANDREL = 'mandrel'
+
 export const VERSION_DEV = 'dev'
 export const VERSION_LATEST = 'latest'

+export const JDK_ARCH = determineJDKArchitecture()
+export const JDK_PLATFORM = determineJDKPlatform()
+export const JDK_HOME_SUFFIX = IS_MACOS ? '/Contents/Home' : ''
+
 export const GRAALVM_ARCH = determineGraalVMArchitecture()
 export const GRAALVM_FILE_EXTENSION = IS_WINDOWS ? '.zip' : '.tar.gz'
 export const GRAALVM_GH_USER = 'graalvm'
 export const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform
 export const GRAALVM_RELEASES_REPO = 'graalvm-ce-builds'
-export const JDK_HOME_SUFFIX = IS_MACOS ? '/Contents/Home' : ''

 export const MANDREL_NAMESPACE = 'mandrel-'

@@ -32,9 +40,46 @@ export const GDS_GRAALVM_PRODUCT_ID = 'D53FAE8052773FFAE0530F15000AA6C6'
 export const ENV_GITHUB_EVENT_NAME = 'GITHUB_EVENT_NAME'
 export const EVENT_NAME_PULL_REQUEST = 'pull_request'

+export const ERROR_HINT =
+  'If you think this is a mistake, please file an issue at: https://github.com/graalvm/setup-graalvm/issues.'
+
 export type LatestReleaseResponse =
  otypes.Endpoints['GET /repos/{owner}/{repo}/releases/latest']['response']

+export type MatchingRefsResponse =
+  otypes.Endpoints['GET /repos/{owner}/{repo}/git/matching-refs/{ref}']['response']
+
+function determineJDKArchitecture(): string {
+  switch (process.arch) {
+    case 'x64': {
+      return 'x64'
+    }
+    case 'arm64': {
+      return 'aarch64'
+    }
+    default: {
+      throw new Error(`Unsupported architecture: ${process.arch}`)
+    }
+  }
+}
+
+function determineJDKPlatform(): string {
+  switch (process.platform) {
+    case 'linux': {
+      return 'linux'
+    }
+    case 'darwin': {
+      return 'macos'
+    }
+    case 'win32': {
+      return 'windows'
+    }
+    default: {
+      throw new Error(`Unsupported platform: ${process.platform}`)
+    }
+  }
+}
+
 function determineGraalVMArchitecture(): string {
  switch (process.arch) {
    case 'x64': {
--- a/src/features/cache.ts
+++ b/src/features/cache.ts
@@ -167,6 +167,10 @@ export async function save(id: string): Promise<void> {
    await cache.saveCache(packageManager.path, primaryKey)
    core.info(`Cache saved with the key: ${primaryKey}`)
  } catch (error) {
+    if (!(error instanceof Error)) {
+      core.info(`Not an Error: ${error}`)
+      throw error
+    }
    if (error.name === cache.ReserveCacheError.name) {
      core.info(error.message)
    } else {
--- a/src/features/check-for-updates.ts
+++ b/src/features/check-for-updates.ts
@@ -1,33 +1,31 @@
 import * as core from '@actions/core'
-import {getLatestRelease, toSemVer} from '../utils'
-import {lt, major, minor, valid} from 'semver'
-import {findGraalVMVersion} from '../graalvm'
-import {GRAALVM_RELEASES_REPO} from '../constants'

-export async function checkForUpdates(
+export function checkForUpdates(
  graalVMVersion: string,
  javaVersion: string
-): Promise<void> {
+): void {
+  if (javaVersion === '20') {
+    core.notice(
+      'A new GraalVM release is available! Please consider upgrading to GraalVM for JDK 21: https://medium.com/graalvm/graalvm-for-jdk-21-is-here-ee01177dd12d'
+    )
+    return
+  }
+  if (
+    graalVMVersion.length > 0 &&
+    (javaVersion === '17' || javaVersion === '19')
+  ) {
+    const recommendedJDK = javaVersion === '17' ? '17' : '21'
+    core.notice(
+      `A new GraalVM release is available! Please consider upgrading to GraalVM for JDK ${recommendedJDK}. Instructions: https://github.com/graalvm/setup-graalvm#migrating-from-graalvm-223-or-earlier-to-the-new-graalvm-for-jdk-17-and-later`
+    )
+    return
+  }
+
  if (graalVMVersion.startsWith('22.3.') && javaVersion === '11') {
    core.notice(
      'Please consider upgrading your project to Java 17+. GraalVM 22.3.X releases are the last to support JDK11: https://github.com/oracle/graal/issues/5063'
    )
    return
  }
-
-  const latestRelease = await getLatestRelease(GRAALVM_RELEASES_REPO)
-  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)}/`
-    )
-  }
+  // TODO: add support for JDK-specific update checks (e.g., 17.0.X)
 }
--- a/src/features/reports.ts
+++ b/src/features/reports.ts
@@ -33,11 +33,18 @@ 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
  }
@@ -49,6 +56,9 @@ interface BuildOutput {
    }
    image_heap: {
      bytes: number
+      objects?: {
+        count: number
+      }
      resources: {
        count: number
        bytes: number
@@ -75,10 +85,12 @@ 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()
@@ -86,6 +98,7 @@ export async function setUpNativeImageBuildReports(
    return
  }
  const isSupported =
+    isGraalVMforJDK17OrLater ||
    graalVMVersion === c.VERSION_LATEST ||
    graalVMVersion === c.VERSION_DEV ||
    (!graalVMVersion.startsWith(c.MANDREL_NAMESPACE) &&
@@ -153,7 +166,12 @@ 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 -
@@ -170,12 +188,59 @@ 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 as part of the '${
+\`${info.name}\` generated${totalTime} as part of the '${
    context.job
  }' job in run <a href="${context.serverUrl}/${context.repo.owner}/${
    context.repo.repo
@@ -183,18 +248,14 @@ function createReport(data: BuildOutput): string {

 #### Environment

-<table>
+<table>${versionLine}${graalLine}
  <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>${info.c_compiler}</td>
+    <td colspan="3">${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>${info.garbage_collector}</td>
+    <td colspan="3">${info.garbage_collector}</td>
  </tr>
 </table>

@@ -215,17 +276,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">${analysis.classes.reachable}</td>
+      <td align="right">${analysisTypes.reachable.toLocaleString()}</td>
      <td align="right">${toPercent(
-        analysis.classes.reachable,
-        analysis.classes.total
+        analysisTypes.reachable,
+        analysisTypes.total
      )}</td>
-      <td align="right">${analysis.fields.reachable}</td>
+      <td align="right">${analysis.fields.reachable.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.fields.reachable,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reachable}</td>
+      <td align="right">${analysis.methods.reachable.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.methods.reachable,
        analysis.methods.total
@@ -233,17 +294,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">${analysis.classes.reflection}</td>
+      <td align="right">${analysisTypes.reflection.toLocaleString()}</td>
      <td align="right">${toPercent(
-        analysis.classes.reflection,
-        analysis.classes.total
+        analysisTypes.reflection,
+        analysisTypes.total
      )}</td>
-      <td align="right">${analysis.fields.reflection}</td>
+      <td align="right">${analysis.fields.reflection.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.fields.reflection,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reflection}</td>
+      <td align="right">${analysis.methods.reflection.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.methods.reflection,
        analysis.methods.total
@@ -251,17 +312,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">${analysis.classes.jni}</td>
+      <td align="right">${analysisTypes.jni.toLocaleString()}</td>
      <td align="right">${toPercent(
-        analysis.classes.jni,
-        analysis.classes.total
+        analysisTypes.jni,
+        analysisTypes.total
      )}</td>
-      <td align="right">${analysis.fields.jni}</td>
+      <td align="right">${analysis.fields.jni.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.fields.jni,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.jni}</td>
+      <td align="right">${analysis.methods.jni.toLocaleString()}</td>
      <td align="right">${toPercent(
        analysis.methods.jni,
        analysis.methods.total
@@ -269,11 +330,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">${analysis.classes.total}</td>
+      <td align="right">${analysisTypes.total.toLocaleString()}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.fields.total}</td>
+      <td align="right">${analysis.fields.total.toLocaleString()}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.methods.total}</td>
+      <td align="right">${analysis.methods.total.toLocaleString()}</td>
      <td align="right">100.000%</td>
    </tr>
  </tbody>
@@ -298,9 +359,7 @@ function createReport(data: BuildOutput): string {
        details.code_area.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${
-        details.code_area.compilation_units
-      } compilation units</td>
+      <td align="left">${details.code_area.compilation_units.toLocaleString()} compilation units</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-image-heap" target="_blank">Image heap</a></td>
@@ -309,9 +368,9 @@ function createReport(data: BuildOutput): string {
        details.image_heap.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${bytesToHuman(
-        details.image_heap.resources.bytes
-      )} for ${details.image_heap.resources.count} resources</td>
+      <td align="left">${objectCount}${bytesToHuman(
+    details.image_heap.resources.bytes
+  )} for ${details.image_heap.resources.count.toLocaleString()} resources</td>
    </tr>${debugInfoLine}
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-other-data" target="_blank">Other data</a></td>
@@ -338,7 +397,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 in ${resources.garbage_collection.count} GCs</td>
+      )}s${gcTotalTimeRatio} 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>
@@ -377,3 +436,11 @@ 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
@@ -27,12 +27,12 @@ interface GDSErrorResponse {
  readonly message: string
 }

-export async function downloadGraalVMEE(
+export async function downloadGraalVMEELegacy(
  gdsToken: string,
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/1.0.10 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const userAgent = `GraalVMGitHubAction/1.1.5 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
  const baseArtifact = await fetchArtifact(
    userAgent,
    'isBase:True',
@@ -70,7 +70,11 @@ export async function fetchArtifact(
    await response.readBody()
  ) as GDSArtifactsResponse
  if (artifactResponse.items.length !== 1) {
-    throw new Error(`Found more than one GDS artifact`)
+    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?`
+    )
  }
  return artifactResponse.items[0]
 }
--- a/src/graalvm.ts
+++ b/src/graalvm.ts
@@ -1,75 +1,148 @@
 import * as c from './constants'
+import * as semver from 'semver'
 import {
  downloadAndExtractJDK,
  downloadExtractAndCacheJDK,
-  getLatestRelease
+  getLatestRelease,
+  getMatchingTags,
+  getTaggedRelease
 } from './utils'
-import {downloadGraalVMEE} from './gds'
+import {downloadGraalVMEELegacy} from './gds'
 import {downloadTool} from '@actions/tool-cache'
+import {basename} from 'path'

+const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm'
 const GRAALVM_CE_DL_BASE = `https://github.com/graalvm/${c.GRAALVM_RELEASES_REPO}/releases/download`
 const GRAALVM_REPO_DEV_BUILDS = 'graalvm-ce-dev-builds'
+const GRAALVM_JDK_TAG_PREFIX = 'jdk-'
 const GRAALVM_TAG_PREFIX = 'vm-'

-export async function setUpGraalVMLatest(
-  gdsToken: string,
-  javaVersion: string
-): Promise<string> {
-  if (gdsToken.length > 0) {
-    return setUpGraalVMRelease(gdsToken, c.VERSION_LATEST, javaVersion)
-  }
-  const latestRelease = await getLatestRelease(c.GRAALVM_RELEASES_REPO)
-  const version = findGraalVMVersion(latestRelease)
-  return setUpGraalVMRelease(gdsToken, version, javaVersion)
-}
+// Support for GraalVM for JDK 17 and later

-export function findGraalVMVersion(release: c.LatestReleaseResponse['data']) {
-  const tag_name = release.tag_name
-  if (!tag_name.startsWith(GRAALVM_TAG_PREFIX)) {
-    throw new Error(`Could not find latest GraalVM release: ${tag_name}`)
-  }
-  return tag_name.substring(GRAALVM_TAG_PREFIX.length, tag_name.length)
-}
-
-export async function setUpGraalVMDevBuild(
-  gdsToken: string,
-  javaVersion: string
+export async function setUpGraalVMJDK(
+  javaVersionOrDev: string
 ): Promise<string> {
-  if (gdsToken.length > 0) {
-    throw new Error('Downloading GraalVM EE dev builds is not supported')
+  if (javaVersionOrDev === c.VERSION_DEV) {
+    return setUpGraalVMJDKDevBuild()
  }
-  const latestDevBuild = await getLatestRelease(GRAALVM_REPO_DEV_BUILDS)
-  let resolvedJavaVersion
-  if (javaVersion == c.VERSION_DEV) {
-    resolvedJavaVersion = findHighestJavaVersion(latestDevBuild, c.VERSION_DEV)
+  const javaVersion = javaVersionOrDev
+  let toolName = determineToolName(javaVersion, false)
+  let downloadUrl: string
+  if (javaVersion.includes('.')) {
+    if (semver.valid(javaVersion)) {
+      const majorJavaVersion = semver.major(javaVersion)
+      const minorJavaVersion = semver.minor(javaVersion)
+      const patchJavaVersion = semver.patch(javaVersion)
+      const isGARelease = minorJavaVersion === 0 && patchJavaVersion === 0
+      let downloadName = toolName
+      if (isGARelease) {
+        // For GA versions of JDKs, /archive/ does not use minor and patch version (see https://www.oracle.com/java/technologies/jdk-script-friendly-urls/)
+        downloadName = determineToolName(majorJavaVersion.toString(), false)
+      }
+      downloadUrl = `${GRAALVM_DL_BASE}/${majorJavaVersion}/archive/${downloadName}${c.GRAALVM_FILE_EXTENSION}`
+    } else {
+      throw new Error(
+        `java-version set to '${javaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
+      )
+    }
  } else {
-    resolvedJavaVersion = javaVersion
+    downloadUrl = `${GRAALVM_DL_BASE}/${javaVersion}/latest/${toolName}${c.GRAALVM_FILE_EXTENSION}`
  }
+  const downloader = async () => downloadGraalVMJDK(downloadUrl, javaVersion)
+  return downloadExtractAndCacheJDK(downloader, toolName, javaVersion)
+}
+
+export async function setUpGraalVMJDKCE(
+  javaVersionOrDev: string
+): Promise<string> {
+  if (javaVersionOrDev === c.VERSION_DEV) {
+    return setUpGraalVMJDKDevBuild()
+  }
+  let javaVersion = javaVersionOrDev
+  if (!javaVersion.includes('.')) {
+    javaVersion = await findLatestGraalVMJDKCEJavaVersion(javaVersion)
+  }
+  if (javaVersion.split('.').length != 3) {
+    throw new Error(
+      `java-version set to '${javaVersionOrDev}', which was resolved to '${javaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
+    )
+  }
+  const toolName = determineToolName(javaVersion, true)
+  const downloadUrl = `${GRAALVM_CE_DL_BASE}/jdk-${javaVersion}/${toolName}${c.GRAALVM_FILE_EXTENSION}`
+  const downloader = async () => downloadGraalVMJDK(downloadUrl, javaVersion)
+  return downloadExtractAndCacheJDK(downloader, toolName, javaVersion)
+}
+
+export async function findLatestGraalVMJDKCEJavaVersion(
+  majorJavaVersion: string
+): Promise<string> {
+  const matchingRefs = await getMatchingTags(
+    `${GRAALVM_JDK_TAG_PREFIX}${majorJavaVersion}`
+  )
+  const lowestNonExistingVersion = '0.0.1'
+  let highestVersion = lowestNonExistingVersion
+  const versionNumberStartIndex = `refs/tags/${GRAALVM_JDK_TAG_PREFIX}`.length
+  for (const matchingRef of matchingRefs) {
+    const currentVersion = matchingRef.ref.substring(versionNumberStartIndex)
+    if (
+      semver.valid(currentVersion) &&
+      semver.gt(currentVersion, highestVersion)
+    ) {
+      highestVersion = currentVersion
+    }
+  }
+  if (highestVersion === lowestNonExistingVersion) {
+    throw new Error(
+      `Unable to find the latest Java version for '${majorJavaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
+    )
+  }
+  return highestVersion
+}
+
+function determineToolName(javaVersion: string, isCommunity: boolean) {
+  return `graalvm${isCommunity ? '-community' : ''}-jdk-${javaVersion}_${
+    c.JDK_PLATFORM
+  }-${c.JDK_ARCH}_bin`
+}
+
+async function downloadGraalVMJDK(
+  downloadUrl: string,
+  javaVersion: string
+): Promise<string> {
+  try {
+    return await downloadTool(downloadUrl)
+  } catch (error) {
+    if (error instanceof Error && error.message.includes('404')) {
+      // Not Found
+      throw new Error(
+        `Failed to download ${basename(
+          downloadUrl
+        )}. Are you sure java-version: '${javaVersion}' is correct?`
+      )
+    }
+    throw new Error(
+      `Failed to download ${basename(downloadUrl)} (error: ${error}).`
+    )
+  }
+}
+
+// Support for GraalVM dev builds
+
+export async function setUpGraalVMJDKDevBuild(): Promise<string> {
+  const latestDevBuild = await getLatestRelease(GRAALVM_REPO_DEV_BUILDS)
+  const resolvedJavaVersion = findHighestJavaVersion(
+    latestDevBuild,
+    c.VERSION_DEV
+  )
  const downloadUrl = findDownloadUrl(latestDevBuild, resolvedJavaVersion)
  return downloadAndExtractJDK(downloadUrl)
 }

-export async function setUpGraalVMRelease(
-  gdsToken: string,
-  version: string,
-  javaVersion: string
-): Promise<string> {
-  const isEE = gdsToken.length > 0
-  const toolName = determineToolName(isEE, javaVersion)
-  let downloader: () => Promise<string>
-  if (isEE) {
-    downloader = async () => downloadGraalVMEE(gdsToken, version, javaVersion)
-  } else {
-    downloader = async () => downloadGraalVMCE(version, javaVersion)
-  }
-  return downloadExtractAndCacheJDK(downloader, toolName, version)
-}
-
 export function findHighestJavaVersion(
  release: c.LatestReleaseResponse['data'],
  version: string
 ): string {
-  const graalVMIdentifierPattern = determineGraalVMIdentifier(
+  const graalVMIdentifierPattern = determineGraalVMLegacyIdentifier(
    false,
    version,
    '(\\d+)'
@@ -99,11 +172,54 @@ export function findHighestJavaVersion(
  }
 }

+// Support for GraalVM 22.X releases and earlier
+
+export async function setUpGraalVMLatest_22_X(
+  gdsToken: string,
+  javaVersion: string
+): Promise<string> {
+  const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.3'
+  if (gdsToken.length > 0) {
+    return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion)
+  }
+  const latestRelease = await getTaggedRelease(
+    c.GRAALVM_RELEASES_REPO,
+    GRAALVM_TAG_PREFIX + lockedVersion
+  )
+  const version = findGraalVMVersion(latestRelease)
+  return setUpGraalVMRelease(gdsToken, version, javaVersion)
+}
+
+export function findGraalVMVersion(release: c.LatestReleaseResponse['data']) {
+  const tag_name = release.tag_name
+  if (!tag_name.startsWith(GRAALVM_TAG_PREFIX)) {
+    throw new Error(`Could not find latest GraalVM release: ${tag_name}`)
+  }
+  return tag_name.substring(GRAALVM_TAG_PREFIX.length, tag_name.length)
+}
+
+export async function setUpGraalVMRelease(
+  gdsToken: string,
+  version: string,
+  javaVersion: string
+): Promise<string> {
+  const isEE = gdsToken.length > 0
+  const toolName = determineLegacyToolName(isEE, version, javaVersion)
+  let downloader: () => Promise<string>
+  if (isEE) {
+    downloader = async () =>
+      downloadGraalVMEELegacy(gdsToken, version, javaVersion)
+  } else {
+    downloader = async () => downloadGraalVMCELegacy(version, javaVersion)
+  }
+  return downloadExtractAndCacheJDK(downloader, toolName, version)
+}
+
 function findDownloadUrl(
  release: c.LatestReleaseResponse['data'],
  javaVersion: string
 ): string {
-  const graalVMIdentifier = determineGraalVMIdentifier(
+  const graalVMIdentifier = determineGraalVMLegacyIdentifier(
    false,
    c.VERSION_DEV,
    javaVersion
@@ -115,31 +231,34 @@ function findDownloadUrl(
    }
  }
  throw new Error(
-    `Could not find GraalVM dev build for Java ${javaVersion}. It may no longer be available, so please consider upgrading the Java version. If you think this is a mistake, please file an issue at: https://github.com/graalvm/setup-graalvm/issues.`
+    `Could not find GraalVM dev build for Java ${javaVersion}. It may no longer be available, so please consider upgrading the Java version. ${c.ERROR_HINT}`
  )
 }

-function determineGraalVMIdentifier(
+function determineGraalVMLegacyIdentifier(
  isEE: boolean,
  version: string,
  javaVersion: string
 ): string {
-  return `graalvm-${isEE ? 'ee' : 'ce'}-java${javaVersion}-${
-    c.GRAALVM_PLATFORM
-  }-${c.GRAALVM_ARCH}-${version}`
+  return `${determineLegacyToolName(isEE, version, javaVersion)}-${
+    c.GRAALVM_ARCH
+  }-${version}`
 }

-function determineToolName(isEE: boolean, javaVersion: string): string {
-  return `graalvm-${isEE ? 'ee' : 'ce'}-java${javaVersion}-${
-    c.GRAALVM_PLATFORM
-  }`
+function determineLegacyToolName(
+  isEE: boolean,
+  version: string,
+  javaVersion: string
+): string {
+  const infix = isEE ? 'ee' : version === c.VERSION_DEV ? 'community' : 'ce'
+  return `graalvm-${infix}-java${javaVersion}-${c.GRAALVM_PLATFORM}`
 }

-async function downloadGraalVMCE(
+async function downloadGraalVMCELegacy(
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const graalVMIdentifier = determineGraalVMIdentifier(
+  const graalVMIdentifier = determineGraalVMLegacyIdentifier(
    false,
    version,
    javaVersion
--- a/src/gu.ts
+++ b/src/gu.ts
@@ -1,3 +1,6 @@
+import * as c from './constants'
+import * as core from '@actions/core'
+import * as semver from 'semver'
 import {GRAALVM_PLATFORM} from './constants'
 import {exec} from './utils'
 import {join} from 'path'
@@ -22,6 +25,42 @@ const COMPONENT_TO_POST_INSTALL_HOOK = new Map<string, Map<string, string>>([
 ])

 export async function setUpGUComponents(
+  javaVersion: string,
+  graalVMVersion: string,
+  graalVMHome: string,
+  components: string[],
+  gdsToken: string
+): Promise<void> {
+  if (components.length == 0) {
+    return // nothing to do
+  }
+  const coercedJavaVersion = semver.coerce(javaVersion)
+  if (
+    graalVMVersion === c.VERSION_DEV ||
+    javaVersion === c.VERSION_DEV ||
+    (coercedJavaVersion != null && semver.gte(coercedJavaVersion, '21.0.0'))
+  ) {
+    if (components.length == 1 && components[0] === 'native-image') {
+      core.warning(
+        `Please remove "components: 'native-image'" from your workflow file. It is automatically included since GraalVM for JDK 17: https://github.com/oracle/graal/pull/5995`
+      )
+    } else {
+      core.warning(
+        `Unable to install component(s): '${components.join(
+          ','
+        )}'. The latest GraalVM dev builds and the upcoming GraalVM for JDK 21 no longer include the GraalVM Updater: https://github.com/oracle/graal/issues/6855`
+      )
+    }
+  } else if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+    core.warning(
+      `Mandrel does not support GraalVM component(s): '${components.join(',')}'`
+    )
+  } else {
+    await installGUComponents(gdsToken, graalVMHome, components)
+  }
+}
+
+async function installGUComponents(
  gdsToken: string,
  graalVMHome: string,
  components: string[]
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,7 @@
 import * as c from './constants'
 import * as core from '@actions/core'
 import * as graalvm from './graalvm'
+import * as semver from 'semver'
 import {isFeatureAvailable as isCacheAvailable} from '@actions/cache'
 import {join} from 'path'
 import {restore} from './features/cache'
@@ -14,12 +15,15 @@ import {setUpNativeImageBuildReports} from './features/reports'

 async function run(): Promise<void> {
  try {
-    const graalvmVersion = core.getInput(c.INPUT_VERSION, {required: true})
-    const gdsToken = core.getInput(c.INPUT_GDS_TOKEN)
    const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, {required: true})
+    const distribution = core.getInput(c.INPUT_DISTRIBUTION)
+    const graalVMVersion = core.getInput(c.INPUT_VERSION)
+    const gdsToken = core.getInput(c.INPUT_GDS_TOKEN)
    const componentsString: string = core.getInput(c.INPUT_COMPONENTS)
    const components: string[] =
-      componentsString.length > 0 ? componentsString.split(',') : []
+      componentsString.length > 0
+        ? componentsString.split(',').map(x => x.trim())
+        : []
    const setJavaHome = core.getInput(c.INPUT_SET_JAVA_HOME) === 'true'
    const cache = core.getInput(c.INPUT_CACHE)
    const enableCheckForUpdates =
@@ -27,36 +31,104 @@ async function run(): Promise<void> {
    const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true'

    if (c.IS_WINDOWS) {
-      setUpWindowsEnvironment(graalvmVersion)
+      setUpWindowsEnvironment(graalVMVersion)
    }
    await setUpDependencies(components)
    if (enableNativeImageMusl) {
      await setUpNativeImageMusl()
    }

-    // Download or build GraalVM
+    // Download GraalVM JDK
+    const isGraalVMforJDK17OrLater =
+      distribution.length > 0 || graalVMVersion.length == 0
    let graalVMHome
-    switch (graalvmVersion) {
-      case c.VERSION_LATEST:
-        graalVMHome = await graalvm.setUpGraalVMLatest(gdsToken, javaVersion)
-        break
-      case c.VERSION_DEV:
-        graalVMHome = await graalvm.setUpGraalVMDevBuild(gdsToken, javaVersion)
-        break
-      default:
-        if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
-          graalVMHome = await setUpMandrel(graalvmVersion, javaVersion)
-        } else {
-          if (enableCheckForUpdates) {
-            await checkForUpdates(graalvmVersion, javaVersion)
+    if (isGraalVMforJDK17OrLater) {
+      if (
+        enableCheckForUpdates &&
+        (distribution === c.DISTRIBUTION_GRAALVM ||
+          distribution === c.DISTRIBUTION_GRAALVM_COMMUNITY)
+      ) {
+        checkForUpdates(graalVMVersion, javaVersion)
+      }
+      switch (distribution) {
+        case c.DISTRIBUTION_GRAALVM:
+          graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
+          break
+        case c.DISTRIBUTION_GRAALVM_COMMUNITY:
+          graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
+          break
+        case c.DISTRIBUTION_MANDREL:
+          graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
+          break
+        case '':
+          if (javaVersion === c.VERSION_DEV) {
+            core.info(
+              `This build is using GraalVM Community Edition. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          } else {
+            core.info(
+              `This build is using the new Oracle GraalVM. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          }
-          graalVMHome = await graalvm.setUpGraalVMRelease(
-            gdsToken,
-            graalvmVersion,
-            javaVersion
-          )
-        }
-        break
+          break
+        default:
+          throw new Error(`Unsupported distribution: ${distribution}`)
+      }
+    } else {
+      const coercedJavaVersion = semver.coerce(javaVersion)
+      switch (graalVMVersion) {
+        case c.VERSION_LATEST:
+          if (
+            javaVersion.startsWith('17') ||
+            (coercedJavaVersion !== null &&
+              semver.gte(coercedJavaVersion, '20.0.0'))
+          ) {
+            core.info(
+              `This build is using the new Oracle GraalVM. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
+          } else {
+            graalVMHome = await graalvm.setUpGraalVMLatest_22_X(
+              gdsToken,
+              javaVersion
+            )
+          }
+          break
+        case c.VERSION_DEV:
+          if (gdsToken.length > 0) {
+            throw new Error(
+              'Downloading GraalVM EE dev builds is not supported'
+            )
+          }
+          if (
+            coercedJavaVersion !== null &&
+            !semver.gte(coercedJavaVersion, '21.0.0')
+          ) {
+            core.warning(
+              `GraalVM dev builds are only available for JDK 21. This build is now using a stable release of GraalVM for JDK ${javaVersion}.`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
+          } else {
+            graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          }
+          break
+        default:
+          if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+            graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
+          } else {
+            if (enableCheckForUpdates) {
+              checkForUpdates(graalVMVersion, javaVersion)
+            }
+            graalVMHome = await graalvm.setUpGraalVMRelease(
+              gdsToken,
+              graalVMVersion,
+              javaVersion
+            )
+          }
+          break
+      }
    }

    // Activate GraalVM
@@ -67,21 +139,18 @@ async function run(): Promise<void> {
      core.exportVariable('JAVA_HOME', graalVMHome)
    }

-    // Set up GraalVM components (if any)
-    if (components.length > 0) {
-      if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
-        core.warning(
-          `Mandrel does not support GraalVM components: ${componentsString}`
-        )
-      } else {
-        await setUpGUComponents(gdsToken, graalVMHome, components)
-      }
-    }
+    await setUpGUComponents(
+      javaVersion,
+      graalVMVersion,
+      graalVMHome,
+      components,
+      gdsToken
+    )

    if (cache && isCacheAvailable()) {
      await restore(cache)
    }
-    setUpNativeImageBuildReports(graalvmVersion)
+    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion)
  } catch (error) {
    if (error instanceof Error) core.setFailed(error.message)
  }
--- a/src/mandrel.ts
+++ b/src/mandrel.ts
@@ -1,27 +1,33 @@
 import * as c from './constants'
+import * as httpClient from '@actions/http-client'
 import {downloadExtractAndCacheJDK, getLatestRelease} from './utils'
 import {downloadTool} from '@actions/tool-cache'
+import {basename} from 'path'

-const MANDREL_REPO = 'mandrel'
-const MANDREL_TAG_PREFIX = c.MANDREL_NAMESPACE
+export const MANDREL_REPO = 'mandrel'
+export const MANDREL_TAG_PREFIX = c.MANDREL_NAMESPACE
 const MANDREL_DL_BASE = 'https://github.com/graalvm/mandrel/releases/download'
+const DISCO_API_BASE = 'https://api.foojay.io/disco/v3.0/packages/jdks'
+
+interface JdkData {
+  message: string
+  result: any
+}

 export async function setUpMandrel(
-  graalvmVersion: string,
+  mandrelVersion: string,
  javaVersion: string
 ): Promise<string> {
-  const mandrelVersion = graalvmVersion.substring(
-    c.MANDREL_NAMESPACE.length,
-    graalvmVersion.length
-  )
-
+  const version = stripMandrelNamespace(mandrelVersion)
  let mandrelHome
-  switch (mandrelVersion) {
+  switch (version) {
+    case '':
+    // fetch latest if no version is specified
    case 'latest':
      mandrelHome = await setUpMandrelLatest(javaVersion)
      break
    default:
-      mandrelHome = await setUpMandrelRelease(mandrelVersion, javaVersion)
+      mandrelHome = await setUpMandrelRelease(version, javaVersion)
      break
  }

@@ -29,32 +35,110 @@ export async function setUpMandrel(
 }

 async function setUpMandrelLatest(javaVersion: string): Promise<string> {
-  const latestRelease = await getLatestRelease(MANDREL_REPO)
-  const tag_name = latestRelease.tag_name
-  if (tag_name.startsWith(MANDREL_TAG_PREFIX)) {
-    const latestVersion = tag_name.substring(
-      MANDREL_TAG_PREFIX.length,
-      tag_name.length
-    )
-    return setUpMandrelRelease(latestVersion, javaVersion)
+  const latest_release_url = await getLatestMandrelReleaseUrl(javaVersion)
+  const version_tag = getTagFromURI(latest_release_url)
+  const version = stripMandrelNamespace(version_tag)
+
+  const toolName = determineToolName(javaVersion)
+  return downloadExtractAndCacheJDK(
+    async () => downloadTool(latest_release_url),
+    toolName,
+    version
+  )
+}
+
+// Download URIs are of the form https://github.com/graalvm/mandrel/releases/download/<tag>/<archive-name>
+function getTagFromURI(uri: string): string {
+  const parts = uri.split('/')
+  try {
+    return parts[parts.length - 2]
+  } catch (error) {
+    throw new Error(`Failed to extract tag from URI ${uri}: ${error}`)
+  }
+}
+
+export async function getLatestMandrelReleaseUrl(
+  javaVersion: string
+): Promise<string> {
+  const url = `${DISCO_API_BASE}?jdk_version=${javaVersion}&distribution=${c.DISTRIBUTION_MANDREL}&architecture=${c.JDK_ARCH}&operating_system=${c.JDK_PLATFORM}&latest=per_distro`
+  const _http = new httpClient.HttpClient()
+  const response = await _http.getJson<JdkData>(url)
+  if (response.statusCode !== 200) {
+    throw new Error(
+      `Failed to fetch latest Mandrel release for Java ${javaVersion} from DISCO API: ${response.result}`
+    )
+  }
+  const result = response.result?.result[0]
+  try {
+    const pkg_info_uri = result.links.pkg_info_uri
+    return await getLatestMandrelReleaseUrlHelper(
+      _http,
+      javaVersion,
+      pkg_info_uri
+    )
+  } catch (error) {
+    throw new Error(
+      `Failed to get latest Mandrel release for Java ${javaVersion} from DISCO API: ${error}`
+    )
+  }
+}
+
+async function getLatestMandrelReleaseUrlHelper(
+  _http: httpClient.HttpClient,
+  java_version: string,
+  pkg_info_uri: string
+): Promise<string> {
+  const response = await _http.getJson<JdkData>(pkg_info_uri)
+  if (response.statusCode !== 200) {
+    throw new Error(
+      `Failed to fetch package info of latest Mandrel release for Java ${java_version} from DISCO API: ${response.result}`
+    )
+  }
+  const result = response.result?.result[0]
+  try {
+    return result.direct_download_uri
+  } catch (error) {
+    throw new Error(
+      `Failed to get download URI of latest Mandrel release for Java ${java_version} from DISCO API: ${error}`
+    )
  }
-  throw new Error(`Could not find latest Mandrel release: ${tag_name}`)
 }

 async function setUpMandrelRelease(
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const identifier = determineMandrelIdentifier(version, javaVersion)
-  const downloadUrl = `${MANDREL_DL_BASE}/${MANDREL_TAG_PREFIX}${version}/${identifier}${c.GRAALVM_FILE_EXTENSION}`
  const toolName = determineToolName(javaVersion)
  return downloadExtractAndCacheJDK(
-    async () => downloadTool(downloadUrl),
+    async () => downloadMandrelJDK(version, javaVersion),
    toolName,
    version
  )
 }

+async function downloadMandrelJDK(
+  version: string,
+  javaVersion: string
+): Promise<string> {
+  const identifier = determineMandrelIdentifier(version, javaVersion)
+  const downloadUrl = `${MANDREL_DL_BASE}/${MANDREL_TAG_PREFIX}${version}/${identifier}${c.GRAALVM_FILE_EXTENSION}`
+  try {
+    return await downloadTool(downloadUrl)
+  } catch (error) {
+    if (error instanceof Error && error.message.includes('404')) {
+      // Not Found
+      throw new Error(
+        `Failed to download ${basename(
+          downloadUrl
+        )}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`
+      )
+    }
+    throw new Error(
+      `Failed to download ${basename(downloadUrl)} (error: ${error}).`
+    )
+  }
+}
+
 function determineMandrelIdentifier(
  version: string,
  javaVersion: string
@@ -65,3 +149,14 @@ function determineMandrelIdentifier(
 function determineToolName(javaVersion: string): string {
  return `mandrel-java${javaVersion}-${c.GRAALVM_PLATFORM}`
 }
+
+export function stripMandrelNamespace(graalVMVersion: string) {
+  if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+    return graalVMVersion.substring(
+      c.MANDREL_NAMESPACE.length,
+      graalVMVersion.length
+    )
+  } else {
+    return graalVMVersion
+  }
+}
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -47,6 +47,40 @@ export async function getLatestRelease(
  ).data
 }

+export async function getTaggedRelease(
+  repo: string,
+  tag: string
+): Promise<c.LatestReleaseResponse['data']> {
+  const githubToken = getGitHubToken()
+  const options = githubToken.length > 0 ? {auth: githubToken} : {}
+  const octokit = new GitHubDotCom(options)
+  return (
+    await octokit.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', {
+      owner: c.GRAALVM_GH_USER,
+      repo,
+      tag
+    })
+  ).data
+}
+
+export async function getMatchingTags(
+  tagPrefix: string
+): Promise<c.MatchingRefsResponse['data']> {
+  const githubToken = getGitHubToken()
+  const options = githubToken.length > 0 ? {auth: githubToken} : {}
+  const octokit = new GitHubDotCom(options)
+  return (
+    await octokit.request(
+      'GET /repos/{owner}/{repo}/git/matching-refs/tags/{tagPrefix}',
+      {
+        owner: c.GRAALVM_GH_USER,
+        repo: c.GRAALVM_RELEASES_REPO,
+        tagPrefix
+      }
+    )
+  ).data
+}
+
 export async function downloadAndExtractJDK(
  downloadUrl: string
 ): Promise<string> {
Author	SHA1	Message	Date
Foivos Zakkak	b8dc5fccfb	Get latest mandrel release if version not specified Update doc.	2023-11-03 13:30:38 +01:00
Foivos Zakkak	1c219f5b27	Remove user-agent from HttpClient	2023-11-03 13:30:38 +01:00
Fabio Niephaus	2a93b69fdf	Bump version to `1.1.5`.	2023-11-03 13:12:28 +01:00
Fabio Niephaus	0b782b6b90	Support fixed GA versions of Oracle GraalVM.	2023-11-03 13:01:11 +01:00
Fabio Niephaus	d5b07dd118	Lock `java-version` to `17.0.8`. This is the last release with access to all tested GU components.	2023-11-03 12:36:12 +01:00
Foivos Zakkak	40dc6ae006	Restore windows latest test & add test for non-prefixed mandrel ver	2023-11-03 12:07:47 +01:00
Foivos Zakkak	cde0daed27	Relax requirement of mandrel versions starting with mandrel- Since we can now define the distribution there is no longer the need to include the mandrel- prefix in Mandrel versions.	2023-11-03 12:07:47 +01:00
Foivos Zakkak	22b65d7de0	Use Foojay.io DISCO API to get latest Mandrel release	2023-11-03 12:07:47 +01:00
Foivos Zakkak	c2fd2d6d8e	Improve error log for wrong mandrel version and javaVersion comb. Add test to test similar to the GraalVM one for the expected error output.	2023-11-03 12:07:47 +01:00
dependabot[bot]	2b3d0bde8f	Bump @babel/traverse from 7.21.4 to 7.23.2 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-19 08:40:23 +02:00
Fabio Niephaus	6c7d417a1e	Fix additional test case.	2023-09-20 13:02:55 +02:00
Fabio Niephaus	8dd4f51a5e	Fix gu integration for GraalVM for JDK 21. Fixes #62.	2023-09-20 12:59:33 +02:00
Fabio Niephaus	2fb264a6b0	Fix upgrade notice for JDK 20 users.	2023-09-20 09:48:31 +02:00
Fabio Niephaus	0a27862568	Bump version to `1.1.4`.	2023-09-19 15:51:30 +02:00
Fabio Niephaus	70003e7f9f	Disable `Build Ruby-FFI with TruffleRuby` step.	2023-09-19 15:50:03 +02:00
Fabio Niephaus	814434c7a9	Add upgrade notice for JDK 20 users.	2023-09-19 15:41:40 +02:00
Fabio Niephaus	3282b5e43f	Updates for GraalVM for JDK 21 release.	2023-09-19 15:41:39 +02:00
Fabio Niephaus	26eec53160	Use and recommend `actions/checkout@v4`.	2023-09-19 14:30:35 +02:00
Fabio Niephaus	0e29e36dce	Fix version check for gu and add a better warning.	2023-09-06 10:55:08 +02:00
Fabio Niephaus	ac032b0e7e	Bump version to `1.1.3`.	2023-09-06 09:53:17 +02:00
Fabio Niephaus	8cd3284efc	Relax environment checks.	2023-09-06 09:45:00 +02:00
Fabio Niephaus	8f1dbd2ce5	Regenerate files.	2023-09-06 09:34:35 +02:00
Fabio Niephaus	d3b90f817c	Upgrade 22.3.X builds to `22.3.3`. GraalVM Updater no longer works on `22.3.0`.	2023-09-06 09:34:35 +02:00
Fabio Niephaus	570f6b20e6	Use stable release for dev builds on JDK 20 and earlier. See #36	2023-09-06 09:30:10 +02:00
Fabio Niephaus	265e01895c	Prepare for deprecation of GraalVM Updater.	2023-09-06 09:08:02 +02:00
Fabio Niephaus	c569e64c0b	Add missing `break` statement (fixes #54 ).	2023-08-01 14:11:14 +02:00
Fabio Niephaus	d189178615	Bump version to `1.1.2`.	2023-07-26 11:22:38 +02:00
Fabio Niephaus	ddf952dc27	Regenerate files.	2023-07-26 11:21:13 +02:00
Fabio Niephaus	2358846013	Run `npm audit fix`.	2023-07-26 11:21:00 +02:00
Fabio Niephaus	473558a7d4	Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/tough-cookie-and-azure/ms-rest-js--removed'	2023-07-26 11:17:00 +02:00
Fabio Niephaus	10c2dc22fc	Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/semver-7.5.2'	2023-07-26 11:16:51 +02:00
Fabio Niephaus	238098cb83	Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/word-wrap-1.2.5'	2023-07-26 11:16:42 +02:00
dependabot[bot]	911e3cee00	Bump tough-cookie and @azure/ms-rest-js Removes [tough-cookie](https://github.com/salesforce/tough-cookie). It's no longer used after updating ancestor dependency [@azure/ms-rest-js](https://github.com/Azure/ms-rest-js). These dependencies need to be updated together. Removes `tough-cookie` Updates `@azure/ms-rest-js` from 2.6.6 to 2.7.0 - [Changelog](https://github.com/Azure/ms-rest-js/blob/master/Changelog.md) - [Commits](https://github.com/Azure/ms-rest-js/commits) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: "@azure/ms-rest-js" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-26 05:50:05 +00:00
dependabot[bot]	c6bf0c3fb6	Bump semver from 7.4.0 to 7.5.2 Bumps [semver](https://github.com/npm/node-semver) from 7.4.0 to 7.5.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.4.0...v7.5.2) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-26 05:50:00 +00:00
dependabot[bot]	eaee860665	Bump word-wrap from 1.2.3 to 1.2.5 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-26 05:49:48 +00:00
Fabio Niephaus	d67b180a8e	Bump version to `1.1.1`.	2023-07-24 15:51:50 +02:00
Fabio Niephaus	8ae40e7db9	Use `22.3.1` when `java-version` set to `19`. This only applies to builds that use the old `version` option.	2023-06-20 15:37:11 +02:00
Fabio Niephaus	4a419f5908	Fix incorrect `os` name in workflow.	2023-06-20 13:13:30 +02:00
Fabio Niephaus	9180004c5f	Clean up update checks after GraalVM for JDK 17 release.	2023-06-20 13:04:33 +02:00
Fabio Niephaus	6a5fa2da72	Mark 22.3.2 as latest when `version` opt is used.	2023-06-20 13:02:17 +02:00
Fabio Niephaus	578fd31702	Improve support for Mandrel distribution. Fixes #48	2023-06-20 11:57:57 +02:00
Fabio Niephaus	85ea19c002	Cover empty distribution cases.	2023-06-20 11:57:57 +02:00
Fabio Niephaus	4a5400ac9a	Extend build reports with new data. Updated schema: `f196ab0325/docs/reference-manual/native-image/assets/build-output-schema-v0.9.1.json`	2023-06-20 09:41:35 +02:00
Fabio Niephaus	91fd4d0716	Add missing `break` statement.	2023-06-19 11:11:58 +02:00
Fabio Niephaus	04ca584c1b	Improve version check for reports.	2023-06-17 16:17:49 +02:00
Fabio Niephaus	8f41000162	Bump version to `1.1.0`.	2023-06-16 13:18:20 +02:00
Fabio Niephaus	d476798211	Incorporate additional feedback.	2023-06-16 13:18:20 +02:00
Fabio Niephaus	db8d619f32	Incorporate more reviewer feedback.	2023-06-16 13:18:20 +02:00
Fabio Niephaus	830cd48f7f	Incorporate reviewer feedback.	2023-06-16 13:18:20 +02:00
Fabio Niephaus	c871f91ee0	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 13:18:20 +02:00
Fabio Niephaus	2f50b91043	Temporarily disable Mandrel latest builds on Windows.	2023-06-16 13:18:20 +02:00
Fabio Niephaus	78f22073df	Bump version to `1.0.12`.	2023-06-15 08:22:40 +02:00
Fabio Niephaus	b11d36630f	Temporarily use `22.3.1` for `latest` builds. This is a temporary fix while we are rolling out the new GraalVM for JDK17/20 release.	2023-06-13 19:24:24 +02:00
Fabio Niephaus	babc303d7e	Make parsing of components a bit more robust. Suggested by @michael-simons	2023-04-18 09:46:32 +02:00
dependabot[bot]	5f2753d6bc	Bump xml2js and @azure/core-http Bumps [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) and [@azure/core-http](https://github.com/Azure/azure-sdk-for-js). These dependencies needed to be updated together. Updates `xml2js` from 0.4.23 to 0.5.0 - [Release notes](https://github.com/Leonidas-from-XIV/node-xml2js/releases) - [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/commits/0.5.0) Updates `@azure/core-http` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/Azure/azure-sdk-for-js/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md) - [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/core-http_3.0.0...@azure/core-http_3.0.1) --- updated-dependencies: - dependency-name: xml2js dependency-type: indirect - dependency-name: "@azure/core-http" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-12 08:56:29 +02:00
Fabio Niephaus	6acd592e3e	Bump version to `1.0.11`.	2023-04-11 09:11:01 +02:00
Fabio Niephaus	cf001e2d43	Update dependencies.	2023-04-11 09:09:07 +02:00
Fabio Niephaus	90a2c32c8b	Default to `${{ github.token }}`.	2023-04-11 08:39:53 +02:00
Fabio Niephaus	4297237826	Drop deprecated `ubuntu-18.04`.	2023-04-10 13:53:31 +02:00
Fabio Niephaus	c85a448ca4	Adjust for JDK 20 dev builds.	2023-04-10 13:42:02 +02:00
Fabio Niephaus	c8fdb59e88	Adjust for new dev build naming scheme.	2023-04-10 12:48:07 +02:00
Fabio Niephaus	40947ba8ce	Add test for automatic NI setup on Windows. Context: https://github.com/oracle/graal/pull/5881	2023-02-13 10:57:38 +01:00