Bump version to 1.1.8.

Report java --version when done.
Fixes #81
2024-02-22 12:45:15 +01:00 · 2024-02-22 12:13:25 +01:00 · 2024-02-22 11:25:13 +01:00 · 2024-02-22 11:11:07 +01:00 · 2024-02-22 10:53:11 +01:00 · 2024-02-22 10:24:27 +01:00
19 changed files with 11013 additions and 29502 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,21 +25,20 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        java-version: ['23', '21', '17', '20', 'dev']
+        java-version: ['21', '17', '20', 'dev']
        distribution: ['graalvm', 'graalvm-community']
        os: [
          ubuntu-latest,
-          macos-latest, # macOS on Apple silicon
-          macos-13,     # macOS on Intel
+          macos-14, # macOS on Apple silicon
+          macos-12, # macOS on Intel
          windows-latest
        ]
-        set-gds-token: [false]
        components: ['']
        include:
          - java-version: 'latest-ea'
            distribution: 'graalvm'
            os: ubuntu-latest
-          - java-version: '24-ea'
+          - java-version: '22-ea'
            distribution: 'graalvm'
            os: ubuntu-latest
          - java-version: '21'
@@ -55,14 +54,6 @@ jobs:
          - java-version: '21.0.0' # test for GA version (see #63)
            distribution: 'graalvm'
            os: ubuntu-latest
-          - java-version: '17'
-            distribution: 'graalvm'
-            os: ubuntu-latest
-            set-gds-token: true
-          - java-version: '17.0.13'
-            distribution: 'graalvm'
-            os: ubuntu-latest
-            set-gds-token: true
    steps:
      - uses: actions/checkout@v4
      - name: Run setup-graalvm action
@@ -72,9 +63,6 @@ jobs:
          distribution: ${{ matrix.distribution }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
          components: ${{ matrix.components }}
-          gds-token: ${{ matrix.set-gds-token && secrets.GDS_TOKEN || '' }}
-        # Skip in PR builds that require a GDS token (secrets are not available in PR runs)
-        if: github.event_name != 'pull_request' || !matrix.set-gds-token
      - name: Check environment
        run: |
          echo "GRAALVM_HOME: $GRAALVM_HOME"
@@ -87,16 +75,15 @@ jobs:
          java --version
          java --version | grep "GraalVM" || exit 34
          native-image --version
-        if: runner.os != 'Windows' && (github.event_name != 'pull_request' || !matrix.set-gds-token)
+        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
-        if: runner.os == 'Windows'
  test-ce: # make sure the action works on a clean machine without building
-    needs: test
+    needs: test  
    name: CE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
@@ -115,14 +102,10 @@ jobs:
            java-version: '17'
            components: 'native-image'
            os: ubuntu-20.04
-          - version: '21.2.0'
-            java-version: '8' # for JDK 8 notification
-            components: 'native-image'
-            os: ubuntu-latest
          - version: '22.3.1'
-            java-version: '11' # for JDK 11 notification
+            java-version: '11' # for JDK11 notification
            components: 'native-image'
-            os: macos-13
+            os: macos-11
          - version: '22.3.1'
            java-version: '17'
            components: 'native-image'
@@ -149,8 +132,8 @@ jobs:
            [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
          fi
          echo "JAVA_HOME: $JAVA_HOME"
-          java -version
-          java -version 2>&1 | grep "GraalVM" || exit 34
+          java --version
+          java --version | grep "GraalVM" || exit 34
          native-image --version
          if [[ "${{ matrix.java-version }}" != "dev" ]]; then
            gu list
@@ -160,7 +143,7 @@ jobs:
        run: |
          echo "GRAALVM_HOME: $env:GRAALVM_HOME"
          echo "JAVA_HOME: $env:JAVA_HOME"
-          java -version
+          java --version
          native-image --version
          gu.cmd remove native-image
        if: runner.os == 'Windows'
@@ -256,48 +239,6 @@ jobs:
          java --version
          native-image --version
        if: runner.os == 'Windows'
-  test-liberica:
-    needs: test
-    name: Liberica (${{ matrix.java-version }}, '${{ matrix.java-package }}', ${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        java-version: ['17', '21.0.2']
-        java-package: ['', 'jdk', 'jdk+fx']
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run setup-graalvm action
-        uses: ./
-        with:
-          distribution: liberica
-          java-version: ${{ matrix.java-version }}
-          java-package: ${{ matrix.java-package }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Check environment
-        run: |
-          echo "GRAALVM_HOME: $GRAALVM_HOME"
-          [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
-          echo "JAVA_HOME: $JAVA_HOME"
-          java --version
-          java --version | fgrep -qw ${{ matrix.java-version }} || exit 23
-          native-image --version
-          native-image --version | fgrep -qw ${{ matrix.java-version }} || exit 24
-        if: runner.os != 'Windows'
-      - name: Check Windows environment
-        shell: pwsh
-        run: |
-          echo "GRAALVM_HOME: $env:GRAALVM_HOME"
-          echo "JAVA_HOME: $env:JAVA_HOME"
-          java --version
-          if (!(java --version | findstr \<${{ matrix.java-version }}\>)) {
-            exit 23
-          }
-          native-image --version
-          if (!(native-image --version | findstr \<${{ matrix.java-version }}\>)) {
-            exit 24
-          }
-        if: runner.os == 'Windows'
  test-native-image-windows:
    name: native-image on windows-latest
    runs-on: windows-latest
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # 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 [Oracle GraalVM][graalvm-medium], GraalVM [Community Edition (CE)][repo], [Enterprise Edition (EE)][graalvm-ee], [Mandrel][mandrel], or [Liberica Native Image Kit][liberica] as well as [Native Image][native-image] and GraalVM components such as [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 Oracle GraalVM [releases][graalvm-dl], [EA builds][ea-builds], 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, [Mandrel][mandrel], and [Liberica Native Image Kit][liberica] (see [Options](#options))
+- supports Oracle GraalVM [releases][graalvm-dl], [EA builds][ea-builds], 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>(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))
@@ -29,8 +29,8 @@ jobs:
      - uses: actions/checkout@v4
      - uses: graalvm/setup-graalvm@v1
        with:
-          java-version: '21'      # See 'Options' for more details
-          distribution: 'graalvm' # See 'Supported distributions' for available options
+          java-version: '21'      # See 'Options' section below for all supported versions
+          distribution: 'graalvm' # See 'Options' section below for all available distributions
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Example step
        run: |
@@ -74,13 +74,14 @@ jobs:
          ./helloworld
      
      - name: Upload binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: helloworld-${{ matrix.os }}
          path: helloworld*
 ```

-### Template for Oracle GraalVM Early Access (EA) builds
+<details>
+<summary><h4>Template for Oracle GraalVM Early Access (EA) builds</h4></summary>

 ```yml
 name: Oracle GraalVM Early Access build
@@ -92,53 +93,31 @@ jobs:
      - uses: actions/checkout@v4
      - uses: graalvm/setup-graalvm@v1
        with:
-          java-version: '24-ea' # or 'latest-ea' for the latest Java version available
+          java-version: '22-ea' # or 'latest-ea' for the latest Java version available
          distribution: 'graalvm'
          github-token: ${{ secrets.GITHUB_TOKEN }}
 ```

+</details>
+
 <details>
-<summary><h4>Template for Oracle GraalVM via GraalVM Download Service</h4></summary>
+<summary><h4>Template for older GraalVM releases</h4></summary>

-#### Prerequisites
-
-1. Obtain a token for the GraalVM Download Service. For this, replace `your@email.com` with your email address and run the following `curl` command:
-
-    ```bash
-    curl -sS -X POST "https://gds.oracle.com/api/20220101/licenseAcceptance" \
-      -H "Content-Type: application/json" \
-      -d "{ \"email\": \"your@email.com\", \"licenseId\": \"D53FA58D12817B3CE0530F15000A74CA\", \"type\": \"GENERATE_TOKEN_AND_ACCEPT_LICENSE\"}"
-    ```
-
-    The response should look like this:
-
-    ```json
-    {"token":"<your-token>","status":"UNVERIFIED"}
-    ```
-
-2. Store the value of `<your-token>` as a [GitHub Action secret][gha-secrets]. For the following template, we use the name `GDS_TOKEN`.
-3. Check your emails and accept the license to activate the token.
-4. Use `java-version: '17'` (or a specific version such as `17.0.13`) and provide the `GDS_TOKEN` as shown in the following template:
-
-    ```yml
-    name: Build with Oracle GraalVM for JDK 17 via GDS
-    on: [push, pull_request]
-    jobs:
-      build:
-        runs-on: ubuntu-latest
-        steps:
-          - uses: actions/checkout@v4
-          - uses: graalvm/setup-graalvm@v1
-            with:
-              distribution: 'graalvm'
-              java-version: '17'
-              gds-token: ${{ secrets.GDS_TOKEN }}
-              github-token: ${{ secrets.GITHUB_TOKEN }}
-          - name: Example step
-            run: |
-              java --version
-              native-image --version
-    ```
+```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>

@@ -150,80 +129,32 @@ jobs:
 1. Download the version of [GraalVM Enterprise Edition (EE)][graalvm-ee] you want to run on GitHub Actions.
 2. Use the [GraalVM Updater][gu] to install the GraalVM components you need on GitHub Actions and accept the corresponding licenses.
 3. Run `$GRAALVM_HOME/bin/gu --show-ee-token` to display your token for the GraalVM Download Service.
-4. Store this token as a [GitHub Action secret][gha-secrets]. In the following template, we use the name `GDS_TOKEN`:
+4. Store this token as a [GitHub Action secret][gha-secrets]. For this template, we use the name `GDS_TOKEN`.

-    ```yml
-    name: GraalVM Enterprise Edition 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.0'
-              gds-token: ${{ secrets.GDS_TOKEN }}
-              java-version: '17'
-              components: 'native-image'
-              github-token: ${{ secrets.GITHUB_TOKEN }}
-          - name: Example step
-            run: |
-              java --version
-              native-image --version
-    ```
+```yml
+name: GraalVM Enterprise Edition 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.0'
+          gds-token: ${{ secrets.GDS_TOKEN }}
+          java-version: '17'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Example step
+        run: |
+          java --version
+          native-image --version
+```

 </details>


-## Supported distributions
-
-Currently, the following distributions are supported:
-
-| Keyword | Distribution | Official site | License |
-|-|-|-|-|
-| `graalvm` | Oracle GraalVM | [Link](https://www.graalvm.org/) | [Link](https://www.oracle.com/downloads/licenses/graal-free-license.html) |
-| `graalvm-community` | GraalVM Community Edition | [Link](https://www.graalvm.org/) | [Link](https://github.com/oracle/graal/blob/master/LICENSE) |
-| `mandrel` | Mandrel | [Link](https://github.com/graalvm/mandrel) | [Link](https://github.com/graalvm/mandrel/blob/default/LICENSE) |
-| `liberica` | Liberica NIK | [Link](https://bell-sw.com/liberica-native-image-kit/) | [Link](https://bell-sw.com/liberica_nik_eula/) |
-
-
-## Options
-
-This actions can be configured with the following options:
-
-| Name            | Default  | Description |
-|-----------------|:--------:|-------------|
-| `java-version`<br>*(required)* | n/a | Java version <ul><li>major versions: `'23'`, `'21'`, `'17'`, `'11'`, `'8'`</li><li>specific versions: `'21.0.3'`, `'17.0.11'`</li><li>early access (EA) builds: `'24-ea'` *(requires `distribution: 'graalvm'`)*</li><li>latest EA build: `'latest-ea'` *(requires `distribution: 'graalvm'`)*</li><li>dev builds: `'dev'`</li></ul> |
-| `distribution`  | `'graalvm'` | GraalVM distribution (see [supported distributions](#supported-distributions)) |
-| `java-package`  | `'jdk'` | The package type (`'jdk'` or `'jdk+fx'`). Currently applies to Liberica only. |
-| `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. 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]. |
-| `native-image-pr-reports-update-existing` *) | `'false'` | Instead of posting another comment, update an existing PR comment with the latest Native Image build report. Requires `native-image-pr-reports` to be `true`. |
-| `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 Oracle GraalVM (see [Oracle GraalVM via GDS template](#template-for-oracle-graalvm-via-graalvm-download-service)) or GraalVM Enterprise Edition (see [GraalVM EE template](#template-for-graalvm-enterprise-edition)) via GDS. |
-
-**) Make sure that Native Image is used only once per build job. Otherwise, the report is only generated for the last Native Image build.*
-
-
-## Notes on Oracle GraalVM for JDK 17
-
-GraalVM for JDK 17.0.12 is the [last release of Oracle GraalVM for JDK 17 under the GFTC](https://blogs.oracle.com/java/post/jdk-17-approaches-endofpermissive-license).
-Updates after September 2024 will be licensed under the [GraalVM OTN License Including License for Early Adopter Versions](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) (GOTN) and production use beyond the limited free grants of the GraalVM OTN license will require a fee.
-
-As a user of `setup-graalvm`, you have the following options:
-
- *Recommended*: Upgrade to Oracle GraalVM for JDK 21 or later to receive new updates.
- *Not recommended*: Instead of `java-version: '17'`, use `java-version: '17.0.12'` in your workflow to keep using the last release under GFTC. This will also disable the warning. Note that switching to GraalVM Community Edition or other GraalVM distributions might provide you with even older releases of GraalVM.
- Provide a `gds-token` to access Oracle GraalVM for JDK 17 under GOTN (see [Oracle GraalVM via GDS template](#template-for-oracle-graalvm-via-graalvm-download-service)).
-
-
 ## 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.
@@ -246,12 +177,32 @@ can be replaced with:
 # ...
 - uses: graalvm/setup-graalvm@v1
  with:
-    java-version: '17.0.12' # for a specific JDK 17; or '17' for the latest JDK 17
+    java-version: '17.0.7' # for a specific JDK 17; or '17' for the latest JDK 17
    distribution: 'graalvm' # New 'distribution' option
    # ...
 ```


+## Options
+
+| Name            | Default  | Description |
+|-----------------|:--------:|-------------|
+| `java-version`<br>*(required)* | n/a | Java version <ul><li>major versions: `'21'`, `'17'`, `'11'`, `'8'`</li><li>specific versions: `'21.0.2'`, `'17.0.7'`</li><li>early access (EA) builds: `'22-ea'` *(requires `distribution: 'graalvm'`)*</li><li>latest EA build: `'latest-ea'` *(requires `distribution: 'graalvm'`)*</li><li>dev builds: `'dev'`</li></ul> |
+| `distribution`  | `'graalvm'` | GraalVM distribution <ul><li>Oracle GraalVM: `'graalvm'`</li><li>GraalVM Community Edition: `'graalvm-community'`</li><li>Mandrel: `'mandrel'`</li></ul> |
+| `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. 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.*
+
+
 ## Contributing

 We welcome code contributions. To get started, you will need to sign the [Oracle Contributor Agreement][oca] (OCA).
@@ -262,7 +213,6 @@ Only pull requests from committers that can be verified as having signed the OCA
 [dev-build]: https://github.com/graalvm/graalvm-ce-dev-builds/releases/latest
 [dev-builds]: https://github.com/graalvm/graalvm-ce-dev-builds
 [ea-builds]: https://github.com/graalvm/oracle-graalvm-ea-builds
-[gftc]: https://www.oracle.com/downloads/licenses/graal-free-license.html
 [gha-annotations]: https://github.com/actions/toolkit/tree/main/packages/core#annotations
 [gha-permissions]: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
 [gha-secrets]: https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository
@@ -272,7 +222,6 @@ Only pull requests from committers that can be verified as having signed the OCA
 [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
-[liberica]: https://bell-sw.com/liberica-native-image-kit/
 [mandrel]: https://github.com/graalvm/mandrel
 [mandrel-releases]: https://github.com/graalvm/mandrel/releases
 [mandrel-stable]: https://github.com/graalvm/mandrel/releases/latest
--- a/tests/gds.test.ts
+++ b/tests/gds.test.ts
@@ -1,10 +1,5 @@
 import * as path from 'path'
-import {
-  downloadGraalVM,
-  downloadGraalVMEELegacy,
-  fetchArtifact,
-  fetchArtifactEE
-} from '../src/gds'
+import {downloadGraalVMEELegacy, fetchArtifact} from '../src/gds'
 import {expect, test} from '@jest/globals'

 const TEST_USER_AGENT = 'GraalVMGitHubActionTest/1.0.4'
@@ -12,28 +7,7 @@ const TEST_USER_AGENT = 'GraalVMGitHubActionTest/1.0.4'
 process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')

 test('fetch artifacts', async () => {
-  let artifact = await fetchArtifact(TEST_USER_AGENT, 'isBase:True', '17.0.12')
-  expect(artifact.id).toBe('1C351E8F41BB8E9EE0631518000AE5F2')
-  expect(artifact.checksum).toBe(
-    'b6f3dace24cf1960ec790216f4c86f00d4f43df64e4e8b548f6382f04894713f'
-  )
-  artifact = await fetchArtifact(TEST_USER_AGENT, 'isBase:True', '17')
-  expect(artifact.checksum).toHaveLength(
-    'b6f3dace24cf1960ec790216f4c86f00d4f43df64e4e8b548f6382f04894713f'.length
-  )
-})
-
-test('errors when downloading artifacts', async () => {
-  await expect(downloadGraalVM('invalid', '17')).rejects.toThrow(
-    'The provided "gds-token" was rejected (reason: "Invalid download token", opc-request-id: '
-  )
-  await expect(downloadGraalVM('invalid', '1')).rejects.toThrow(
-    'Unable to find GraalVM for JDK 1'
-  )
-})
-
-test('fetch legacy artifacts', async () => {
-  let artifact = await fetchArtifactEE(
+  let artifact = await fetchArtifact(
    TEST_USER_AGENT,
    'isBase:True',
    '22.1.0',
@@ -43,30 +17,25 @@ test('fetch legacy artifacts', async () => {
  expect(artifact.checksum).toBe(
    '4280782f6c7fcabe0ba707e8389cbfaf7bbe6b0cf634d309e6efcd1b172e3ce6'
  )
-  artifact = await fetchArtifactEE(
-    TEST_USER_AGENT,
-    'isBase:True',
-    '22.1.0',
-    '17'
-  )
+  artifact = await fetchArtifact(TEST_USER_AGENT, 'isBase:True', '22.1.0', '17')
  expect(artifact.id).toBe('DCECD2068882A0E9E0536E16000A9504')
  expect(artifact.checksum).toBe(
    'e897add7d94bc456a61e6f927e831dff759efa3392a4b69c720dd3debc8f947d'
  )

  await expect(
-    fetchArtifactEE(TEST_USER_AGENT, 'isBase:False', '22.1.0', '11')
+    fetchArtifact(TEST_USER_AGENT, 'isBase:False', '22.1.0', '11')
  ).rejects.toThrow('Found more than one GDS artifact')
  await expect(
-    fetchArtifactEE(TEST_USER_AGENT, 'isBase:True', '1.0.0', '11')
+    fetchArtifact(TEST_USER_AGENT, 'isBase:True', '1.0.0', '11')
  ).rejects.toThrow('Unable to find JDK11-based GraalVM EE 1.0.0')
 })

-test('errors when downloading legacy artifacts', async () => {
+test('errors when downloading artifacts', async () => {
  await expect(
    downloadGraalVMEELegacy('invalid', '22.1.0', '11')
  ).rejects.toThrow(
-    'The provided "gds-token" was rejected (reason: "Invalid download token", opc-request-id: '
+    'The provided "gds-token" was rejected (reason: "Invalid download token", opc-request-id: /'
  )
  await expect(
    downloadGraalVMEELegacy('invalid', '1.0.0', '11')
--- a/tests/graalvm.test.ts
+++ b/tests/graalvm.test.ts
@@ -7,7 +7,7 @@ import {
  findHighestJavaVersion,
  findLatestEABuildDownloadUrl
 } from '../src/graalvm'
-import {GRAALVM_GH_USER, GRAALVM_RELEASES_REPO} from '../src/constants'
+import {GRAALVM_RELEASES_REPO} from '../src/constants'

 process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
 process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')
@@ -53,7 +53,6 @@ test('find version/javaVersion', async () => {
  expect(error.message).toContain('Unable to find the latest Java version for')

  const latestRelease = await getTaggedRelease(
-    GRAALVM_GH_USER,
    GRAALVM_RELEASES_REPO,
    'vm-22.3.1'
  )
--- a/tests/liberica.test.ts
+++ b/tests/liberica.test.ts
@@ -1,138 +0,0 @@
-import * as liberica from '../src/liberica'
-import * as c from '../src/constants'
-import * as path from 'path'
-import * as semver from 'semver'
-import {expect, test} from '@jest/globals'
-
-process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
-process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')
-
-test('find latest JDK version', async () => {
-  // Make sure the action can find the latest Java version for known major versions
-  await expectLatestToBe('11', atLeast('11.0.22+12'))
-  await expectLatestToBe('11.0.22', upToBuild('11.0.22+12'))
-  await expectLatestToBe('11.0.22+12', exactly('11.0.22+12'))
-
-  await expectLatestToBe('17', atLeast('17.0.10+13'))
-  await expectLatestToBe('17.0.10', upToBuild('17.0.10+13'))
-  await expectLatestToBe('17.0.10+13', exactly('17.0.10+13'))
-
-  await expectLatestToBe('21', atLeast('21.0.2+14'))
-  await expectLatestToBe('21.0.2', upToBuild('21.0.2+14'))
-  await expectLatestToBe('21.0.2+14', exactly('21.0.2+14'))
-
-  // Outdated major version
-  await expectLatestToFail('20')
-
-  // Outdated CPU versions
-  await expectLatestToFail('11.0.2') // should not resolve to 11.0.22
-  await expectLatestToFail('17.0.1') // should not resolve to 17.0.10
-  await expectLatestToFail('17.0.7+11')
-  await expectLatestToFail('21.0.0+8')
-  await expectLatestToFail('21.0.1')
-
-  // Incorrect build number
-  await expectLatestToFail('17.0.10+10')
-}, 30000)
-
-test('find asset URL', async () => {
-  await expectURL('11.0.22+12', '', 'bellsoft-liberica-vm-openjdk11.0.22')
-  await expectURL('17.0.10+13', 'jdk', 'bellsoft-liberica-vm-openjdk17.0.10')
-
-  if (!c.IS_LINUX) {
-    // This check can fail on Linux because there's no `jdk+fx` package for aarch64 and/or musl
-    await expectURL(
-      '21.0.2+14',
-      'jdk+fx',
-      'bellsoft-liberica-vm-full-openjdk21.0.2'
-    )
-  }
-}, 10000)
-
-type verifier = (
-  version: string,
-  major: number,
-  minor: number,
-  patch: number
-) => void
-
-function atLeast(expectedMinVersion: string): verifier {
-  const expectedMajor = semver.major(expectedMinVersion)
-  return function (
-    version: string,
-    major: number,
-    minor: number,
-    patch: number
-  ) {
-    expect(major).toBe(expectedMajor)
-    if (semver.compareBuild(version, expectedMinVersion) < 0) {
-      throw new Error(`Version ${version} is older than ${expectedMinVersion}`)
-    }
-  }
-}
-
-function upToBuild(expectedMinVersion: string): verifier {
-  const expectedMinor = semver.minor(expectedMinVersion)
-  const expectedPatch = semver.patch(expectedMinVersion)
-  const atLeastVerifier = atLeast(expectedMinVersion)
-  return function (
-    version: string,
-    major: number,
-    minor: number,
-    patch: number
-  ) {
-    atLeastVerifier(version, major, minor, patch)
-    expect(minor).toBe(expectedMinor)
-    expect(patch).toBe(expectedPatch)
-  }
-}
-
-function exactly(expectedVersion: string): verifier {
-  return function (
-    version: string,
-    major: number,
-    minor: number,
-    patch: number
-  ) {
-    if (semver.compareBuild(version, expectedVersion) != 0) {
-      throw new Error(`Expected version ${expectedVersion} but got ${version}`)
-    }
-  }
-}
-
-async function expectLatestToBe(pattern: string, verify: verifier) {
-  const result = await liberica.findLatestLibericaJavaVersion(pattern)
-  expect(semver.valid(result)).toBeDefined()
-  const major = semver.major(result)
-  const minor = semver.minor(result)
-  const patch = semver.patch(result)
-  verify(result, major, minor, patch)
-}
-
-async function expectLatestToFail(pattern: string) {
-  try {
-    const result = await liberica.findLatestLibericaJavaVersion(pattern)
-    throw new Error(
-      `findLatest(${pattern}) should have failed but returned ${result}`
-    )
-  } catch (err) {
-    if (!(err instanceof Error)) {
-      throw new Error(`Unexpected non-Error: ${err}`)
-    }
-    expect(err.message).toContain(
-      `Unable to find the latest version for JDK${pattern}`
-    )
-  }
-}
-
-async function expectURL(
-  javaVersion: string,
-  javaPackage: string,
-  expectedPrefix: string
-) {
-  const url = await liberica.findLibericaURL(javaVersion, javaPackage)
-  expect(url).toBeDefined()
-  const parts = url.split('/')
-  const file = parts[parts.length - 1]
-  expect(file.startsWith(expectedPrefix)).toBe(true)
-}
--- a/tests/msvc.test.ts
+++ b/tests/msvc.test.ts
@@ -1,36 +0,0 @@
-import * as path from 'path'
-import {expect, test} from '@jest/globals'
-import {needsWindowsEnvironmentSetup} from '../src/msvc'
-import {VERSION_DEV, VERSION_LATEST} from '../src/constants'
-
-process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
-process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')
-
-test('decide whether Window env must be set up for GraalVM for JDK', async () => {
-  for (var javaVersion of [
-    '17',
-    '17.0.8',
-    '17.0',
-    '21',
-    '22',
-    '22-ea',
-    '23-ea',
-    VERSION_DEV
-  ]) {
-    expect(needsWindowsEnvironmentSetup(javaVersion, '', true)).toBe(false)
-  }
-})
-
-test('decide whether Window env must be set up for legacy GraalVM', async () => {
-  for (var combination of [
-    ['7', '22.3.0'],
-    ['17', '22.3'],
-    ['7', '22.3'],
-    ['7', VERSION_DEV],
-    ['17', VERSION_LATEST]
-  ]) {
-    expect(
-      needsWindowsEnvironmentSetup(combination[0], combination[1], false)
-    ).toBe(combination[1] !== VERSION_DEV)
-  }
-})
--- a/action.yml
+++ b/action.yml
@@ -2,16 +2,12 @@ name: 'GitHub Action for GraalVM'
 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'
+  icon: 'terminal'  
  color: 'blue'
 inputs:
  java-version:
    required: true
    description: 'Java version. See examples of supported syntax in the README file.'
-  java-package:
-    description: 'The package type (jdk or jdk+fx). Currently applies to Liberica only.'
-    required: false
-    default: 'jdk'
  distribution:
    description: 'GraalVM distribution. See the list of available distributions in the README file.'
    required: false
@@ -47,10 +43,6 @@ inputs:
    required: false
    description: 'Post a comment containing a Native Image build report on pull requests.'
    default: 'false'
-  native-image-pr-reports-update-existing:
-    required: false
-    description: 'Instead of posting another comment, update an existing PR comment with the latest Native Image build report.'
-    default: 'false'
  version:
    required: false
    description: 'GraalVM version (release, latest, dev).'
--- 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.2.7",
+  "version": "1.1.8",
  "private": true,
  "description": "GitHub Action for GraalVM",
  "main": "lib/main.js",
@@ -27,38 +27,37 @@
  "author": "GraalVM Community",
  "license": "UPL",
  "dependencies": {
-    "@actions/cache": "^4.0.0",
-    "@actions/core": "^1.11.1",
+    "@actions/cache": "^3.2.3",
+    "@actions/core": "^1.10.1",
    "@actions/exec": "^1.1.1",
    "@actions/github": "^6.0.0",
-    "@actions/glob": "^0.5.0",
-    "@actions/http-client": "^2.2.3",
+    "@actions/glob": "^0.4.0",
+    "@actions/http-client": "^2.2.0",
    "@actions/io": "^1.1.3",
-    "@actions/tool-cache": "^2.0.2",
-    "@octokit/core": "^5.2.0",
-    "@octokit/types": "^12.6.0",
-    "semver": "^7.6.3",
-    "uuid": "^11.0.5"
+    "@actions/tool-cache": "^2.0.1",
+    "@octokit/core": "^5.1.0",
+    "@octokit/types": "^12.0.0",
+    "semver": "^7.5.4",
+    "uuid": "^9.0.1"
  },
  "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@types/node": "^20.17.12",
-    "@types/semver": "^7.5.8",
-    "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.11.10",
+    "@types/semver": "^7.5.6",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
    "@vercel/ncc": "^0.38.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-github": "^4.10.2",
-    "eslint-plugin-jest": "^27.9.0",
-    "eslint-plugin-jsonc": "^2.14.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint": "^8.56.0",
+    "eslint-plugin-github": "^4.10.1",
+    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-jsonc": "^2.13.0",
    "eslint-plugin-prettier": "^5.1.3",
    "jest": "^29.7.0",
    "js-yaml": "^4.1.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.2.4",
    "prettier-eslint": "^16.3.0",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.2",
    "typescript": "^5.3.3"
  }
 }
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,11 +1,8 @@
 import * as otypes from '@octokit/types'

-export const ACTION_VERSION = '1.2.7'
-
 export const INPUT_VERSION = 'version'
 export const INPUT_GDS_TOKEN = 'gds-token'
 export const INPUT_JAVA_VERSION = 'java-version'
-export const INPUT_JAVA_PACKAGE = 'java-package'
 export const INPUT_DISTRIBUTION = 'distribution'
 export const INPUT_COMPONENTS = 'components'
 export const INPUT_GITHUB_TOKEN = 'github-token'
@@ -23,7 +20,6 @@ export const EXECUTABLE_SUFFIX = IS_WINDOWS ? '.exe' : ''
 export const DISTRIBUTION_GRAALVM = 'graalvm'
 export const DISTRIBUTION_GRAALVM_COMMUNITY = 'graalvm-community'
 export const DISTRIBUTION_MANDREL = 'mandrel'
-export const DISTRIBUTION_LIBERICA = 'liberica'

 export const VERSION_DEV = 'dev'
 export const VERSION_LATEST = 'latest'
--- a/src/features/reports.ts
+++ b/src/features/reports.ts
@@ -2,16 +2,10 @@ import * as c from '../constants'
 import * as core from '@actions/core'
 import * as fs from 'fs'
 import * as github from '@actions/github'
-import * as semver from 'semver'
 import {join} from 'path'
 import {tmpdir} from 'os'
-import {
-  createPRComment,
-  findExistingPRCommentId,
-  isPREvent,
-  toSemVer,
-  updatePRComment
-} from '../utils'
+import {createPRComment, isPREvent, toSemVer} from '../utils'
+import {gte} from 'semver'

 const BUILD_OUTPUT_JSON_PATH = join(tmpdir(), 'native-image-build-output.json')
 const BYTES_TO_KiB = 1024
@@ -21,14 +15,11 @@ const DOCS_BASE =
  'https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/BuildOutput.md'
 const INPUT_NI_JOB_REPORTS = 'native-image-job-reports'
 const INPUT_NI_PR_REPORTS = 'native-image-pr-reports'
-const INPUT_NI_PR_REPORTS_UPDATE = 'native-image-pr-reports-update-existing'
 const NATIVE_IMAGE_CONFIG_FILE = join(
  tmpdir(),
  'native-image-options.properties'
 )
-const NATIVE_IMAGE_OPTIONS_ENV = 'NATIVE_IMAGE_OPTIONS'
 const NATIVE_IMAGE_CONFIG_FILE_ENV = 'NATIVE_IMAGE_CONFIG_FILE'
-const PR_COMMENT_TITLE = '## GraalVM Native Image Build Report'

 interface AnalysisResult {
  total: number
@@ -100,7 +91,6 @@ interface BuildOutput {

 export async function setUpNativeImageBuildReports(
  isGraalVMforJDK17OrLater: boolean,
-  javaVersionOrDev: string,
  graalVMVersion: string
 ): Promise<void> {
  const isRequired = areJobReportsEnabled() || arePRReportsEnabled()
@@ -112,7 +102,7 @@ export async function setUpNativeImageBuildReports(
    graalVMVersion === c.VERSION_LATEST ||
    graalVMVersion === c.VERSION_DEV ||
    (!graalVMVersion.startsWith(c.MANDREL_NAMESPACE) &&
-      semver.gte(toSemVer(graalVMVersion), '22.2.0'))
+      gte(toSemVer(graalVMVersion), '22.2.0'))
  if (!isSupported) {
    core.warning(
      `Build reports for PRs and job summaries are only available in GraalVM 22.2.0 or later. This build job uses GraalVM ${graalVMVersion}.`
@@ -120,7 +110,6 @@ export async function setUpNativeImageBuildReports(
    return
  }
  setNativeImageOption(
-    javaVersionOrDev,
    `-H:BuildOutputJSONFile=${BUILD_OUTPUT_JSON_PATH.replace(/\\/g, '\\\\')}`
  ) // Escape backslashes for Windows
 }
@@ -142,17 +131,7 @@ export async function generateReports(): Promise<void> {
      core.summary.write()
    }
    if (arePRReportsEnabled()) {
-      if (arePRReportsUpdateEnabled()) {
-        const commentId = await findExistingPRCommentId(PR_COMMENT_TITLE)
-        if (commentId) {
-          return updatePRComment(report, commentId)
-        }
-      }
-      return createPRComment(report)
-    } else if (arePRReportsUpdateEnabled()) {
-      throw new Error(
-        `'${INPUT_NI_PR_REPORTS_UPDATE}' option requires '${INPUT_NI_PR_REPORTS}' to be set 'true'`
-      )
+      createPRComment(report)
    }
  }
 }
@@ -165,38 +144,6 @@ function arePRReportsEnabled(): boolean {
  return isPREvent() && core.getInput(INPUT_NI_PR_REPORTS) === 'true'
 }

-function arePRReportsUpdateEnabled(): boolean {
-  return isPREvent() && core.getInput(INPUT_NI_PR_REPORTS_UPDATE) === 'true'
-}
-
-function setNativeImageOption(
-  javaVersionOrDev: string,
-  optionValue: string
-): void {
-  const coercedJavaVersionOrDev = semver.coerce(javaVersionOrDev)
-  if (
-    (coercedJavaVersionOrDev &&
-      semver.gte(coercedJavaVersionOrDev, '22.0.0')) ||
-    javaVersionOrDev === c.VERSION_DEV ||
-    javaVersionOrDev.endsWith('-ea')
-  ) {
-    /* NATIVE_IMAGE_OPTIONS was introduced in GraalVM for JDK 22 (so were EA builds). */
-    let newOptionValue = optionValue
-    const existingOptions = process.env[NATIVE_IMAGE_OPTIONS_ENV]
-    if (existingOptions) {
-      newOptionValue = `${existingOptions} ${newOptionValue}`
-    }
-    core.exportVariable(NATIVE_IMAGE_OPTIONS_ENV, newOptionValue)
-  } else {
-    const optionsFile = getNativeImageOptionsFile()
-    if (fs.existsSync(optionsFile)) {
-      fs.appendFileSync(optionsFile, ` ${optionValue}`)
-    } else {
-      fs.writeFileSync(optionsFile, `NativeImageArgs = ${optionValue}`)
-    }
-  }
-}
-
 function getNativeImageOptionsFile(): string {
  let optionsFile = process.env[NATIVE_IMAGE_CONFIG_FILE_ENV]
  if (optionsFile === undefined) {
@@ -206,6 +153,15 @@ function getNativeImageOptionsFile(): string {
  return optionsFile
 }

+function setNativeImageOption(value: string): void {
+  const optionsFile = getNativeImageOptionsFile()
+  if (fs.existsSync(optionsFile)) {
+    fs.appendFileSync(optionsFile, ` ${value}`)
+  } else {
+    fs.writeFileSync(optionsFile, `NativeImageArgs = ${value}`)
+  }
+}
+
 function createReport(data: BuildOutput): string {
  const context = github.context
  const info = data.general_info
@@ -282,7 +238,7 @@ function createReport(data: BuildOutput): string {
    )} of total time)`
  }

-  return `${PR_COMMENT_TITLE}
+  return `## GraalVM Native Image Build Report

 \`${info.name}\` generated${totalTime} as part of the '${
    context.job
--- a/src/gds.ts
+++ b/src/gds.ts
@@ -6,7 +6,6 @@ import * as io from '@actions/io'
 import * as path from 'path'
 import * as stream from 'stream'
 import * as util from 'util'
-import * as semver from 'semver'
 import {IncomingHttpHeaders, OutgoingHttpHeaders} from 'http'
 import {RetryHelper} from '@actions/tool-cache/lib/retry-helper'
 import {calculateSHA256} from './utils'
@@ -27,26 +26,13 @@ interface GDSErrorResponse {
  readonly message: string
 }

-export async function downloadGraalVM(
-  gdsToken: string,
-  javaVersion: string
-): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/${c.ACTION_VERSION} (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
-  const baseArtifact = await fetchArtifact(
-    userAgent,
-    'isBase:True',
-    javaVersion
-  )
-  return downloadArtifact(gdsToken, userAgent, baseArtifact)
-}
-
 export async function downloadGraalVMEELegacy(
  gdsToken: string,
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/${c.ACTION_VERSION} (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
-  const baseArtifact = await fetchArtifactEE(
+  const userAgent = `GraalVMGitHubAction/1.1.8 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const baseArtifact = await fetchArtifact(
    userAgent,
    'isBase:True',
    version,
@@ -56,49 +42,6 @@ export async function downloadGraalVMEELegacy(
 }

 export async function fetchArtifact(
-  userAgent: string,
-  metadata: string,
-  javaVersion: string
-): Promise<GDSArtifact> {
-  const http = new httpClient.HttpClient(userAgent)
-
-  let filter
-  if (javaVersion.includes('.')) {
-    filter = `metadata=version:${javaVersion}`
-  } else {
-    filter = `sortBy=timeCreated&sortOrder=DESC&limit=1` // latest and only one item
-  }
-
-  let majorJavaVersion
-  if (semver.valid(javaVersion)) {
-    majorJavaVersion = semver.major(javaVersion)
-  } else {
-    majorJavaVersion = javaVersion
-  }
-
-  const catalogOS = c.IS_MACOS ? 'macos' : c.GRAALVM_PLATFORM
-  const requestUrl = `${c.GDS_BASE}/artifacts?productId=${c.GDS_GRAALVM_PRODUCT_ID}&displayName=Oracle%20GraalVM&${filter}&metadata=java:jdk${majorJavaVersion}&metadata=os:${catalogOS}&metadata=arch:${c.GRAALVM_ARCH}&metadata=${metadata}&status=PUBLISHED&responseFields=id&responseFields=checksum`
-  core.debug(`Requesting ${requestUrl}`)
-  const response = await http.get(requestUrl, {accept: 'application/json'})
-  if (response.message.statusCode !== 200) {
-    throw new Error(
-      `Unable to find GraalVM for JDK ${javaVersion}. Are you sure java-version: '${javaVersion}' is correct?`
-    )
-  }
-  const artifactResponse = JSON.parse(
-    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 java-version: '${javaVersion}' is correct?`
-    )
-  }
-  return artifactResponse.items[0]
-}
-
-export async function fetchArtifactEE(
  userAgent: string,
  metadata: string,
  version: string,
--- a/src/graalvm.ts
+++ b/src/graalvm.ts
@@ -1,5 +1,4 @@
 import * as c from './constants'
-import * as core from '@actions/core'
 import * as semver from 'semver'
 import {
  downloadAndExtractJDK,
@@ -9,7 +8,7 @@ import {
  getMatchingTags,
  getTaggedRelease
 } from './utils'
-import {downloadGraalVM, downloadGraalVMEELegacy} from './gds'
+import {downloadGraalVMEELegacy} from './gds'
 import {downloadTool} from '@actions/tool-cache'
 import {basename} from 'path'

@@ -24,27 +23,13 @@ const GRAALVM_TAG_PREFIX = 'vm-'
 // Support for GraalVM for JDK 17 and later

 export async function setUpGraalVMJDK(
-  javaVersionOrDev: string,
-  gdsToken: string
+  javaVersionOrDev: string
 ): Promise<string> {
  if (javaVersionOrDev === c.VERSION_DEV) {
    return setUpGraalVMJDKDevBuild()
  }
-  const isTokenProvided = gdsToken.length > 0
  let javaVersion = javaVersionOrDev
  const toolName = determineToolName(javaVersion, false)
-  if (javaVersionOrDev === '17' && !isTokenProvided) {
-    core.warning(
-      'This build uses the last update of Oracle GraalVM for JDK 17 under the GFTC. More details: https://github.com/marketplace/actions/github-action-for-graalvm#notes-on-oracle-graalvm-for-jdk-17'
-    )
-    return setUpGraalVMJDK('17.0.12', gdsToken)
-  }
-  if (isTokenProvided) {
-    // Download from GDS
-    const downloader = async () => downloadGraalVM(gdsToken, javaVersion)
-    return downloadExtractAndCacheJDK(downloader, toolName, javaVersion)
-  }
-  // Download from oracle.com
  let downloadName = toolName
  let downloadUrl: string
  if (javaVersion.endsWith('-ea')) {
@@ -153,8 +138,6 @@ export async function findLatestGraalVMJDKCEJavaVersion(
  majorJavaVersion: string
 ): Promise<string> {
  const matchingRefs = await getMatchingTags(
-    c.GRAALVM_GH_USER,
-    c.GRAALVM_RELEASES_REPO,
    `${GRAALVM_JDK_TAG_PREFIX}${majorJavaVersion}`
  )
  const lowestNonExistingVersion = '0.0.1'
@@ -261,7 +244,6 @@ export async function setUpGraalVMLatest_22_X(
    return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion)
  }
  const latestRelease = await getTaggedRelease(
-    c.GRAALVM_GH_USER,
    c.GRAALVM_RELEASES_REPO,
    GRAALVM_TAG_PREFIX + lockedVersion
  )
--- a/src/liberica.ts
+++ b/src/liberica.ts
@@ -1,119 +0,0 @@
-import * as c from './constants'
-import * as semver from 'semver'
-import {
-  downloadExtractAndCacheJDK,
-  getTaggedRelease,
-  getMatchingTags
-} from './utils'
-import {downloadTool} from '@actions/tool-cache'
-import {spawnSync} from 'child_process'
-
-const LIBERICA_GH_USER = 'bell-sw'
-const LIBERICA_RELEASES_REPO = 'LibericaNIK'
-const LIBERICA_JDK_TAG_PREFIX = 'jdk-'
-const LIBERICA_VM_PREFIX = 'bellsoft-liberica-vm-'
-
-export async function setUpLiberica(
-  javaVersion: string,
-  javaPackage: string
-): Promise<string> {
-  const resolvedJavaVersion = await findLatestLibericaJavaVersion(javaVersion)
-  const downloadUrl = await findLibericaURL(resolvedJavaVersion, javaPackage)
-  const toolName = determineToolName(javaVersion, javaPackage)
-  return downloadExtractAndCacheJDK(
-    async () => downloadTool(downloadUrl),
-    toolName,
-    javaVersion
-  )
-}
-
-export async function findLatestLibericaJavaVersion(
-  javaVersion: string
-): Promise<string> {
-  const matchingRefs = await getMatchingTags(
-    LIBERICA_GH_USER,
-    LIBERICA_RELEASES_REPO,
-    `${LIBERICA_JDK_TAG_PREFIX}${javaVersion}`
-  )
-  const noMatch = '0.0.1'
-  let bestMatch = noMatch
-  const prefixLength = `refs/tags/${LIBERICA_JDK_TAG_PREFIX}`.length
-  const patternLength = javaVersion.length
-  for (const matchingRef of matchingRefs) {
-    const version = matchingRef.ref.substring(prefixLength)
-    if (
-      semver.valid(version) &&
-      // pattern '17.0.1' should match '17.0.1+12' but not '17.0.10'
-      (version.length <= patternLength ||
-        !isDigit(version.charAt(patternLength))) &&
-      semver.compareBuild(version, bestMatch) == 1
-    ) {
-      bestMatch = version
-    }
-  }
-  if (bestMatch === noMatch) {
-    throw new Error(
-      `Unable to find the latest version for JDK${javaVersion}. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
-    )
-  }
-  return bestMatch
-}
-
-export async function findLibericaURL(
-  javaVersion: string,
-  javaPackage: string
-): Promise<string> {
-  const release = await getTaggedRelease(
-    LIBERICA_GH_USER,
-    LIBERICA_RELEASES_REPO,
-    LIBERICA_JDK_TAG_PREFIX + javaVersion
-  )
-  const platform = determinePlatformPart()
-  const assetPrefix = `${LIBERICA_VM_PREFIX}${determineVariantPart(
-    javaPackage
-  )}openjdk${javaVersion}`
-  const assetSuffix = `-${platform}${c.GRAALVM_FILE_EXTENSION}`
-  for (const asset of release.assets) {
-    if (
-      asset.name.startsWith(assetPrefix) &&
-      asset.name.endsWith(assetSuffix)
-    ) {
-      return asset.browser_download_url
-    }
-  }
-  throw new Error(
-    `Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}. ${c.ERROR_REQUEST}`
-  )
-}
-
-function determineToolName(javaVersion: string, javaPackage: string) {
-  const variant = determineVariantPart(javaPackage)
-  const platform = determinePlatformPart()
-  return `${LIBERICA_VM_PREFIX}${variant}${platform}`
-}
-
-function determineVariantPart(javaPackage: string) {
-  return javaPackage !== null && javaPackage.includes('+fx') ? 'full-' : ''
-}
-
-function determinePlatformPart() {
-  if (isMuslBasedLinux()) {
-    return `linux-${c.JDK_ARCH}-musl`
-  } else {
-    return `${c.JDK_PLATFORM}-${c.GRAALVM_ARCH}`
-  }
-}
-
-function isMuslBasedLinux() {
-  if (c.IS_LINUX) {
-    const output = spawnSync('ldd', ['--version']).stderr.toString('utf8')
-    if (output.includes('musl')) {
-      return true
-    }
-  }
-  return false
-}
-
-function isDigit(c: string) {
-  return c.charAt(0) >= '0' && c.charAt(0) <= '9'
-}
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,6 @@ import {restore} from './features/cache'
 import {setUpDependencies} from './dependencies'
 import {setUpGUComponents} from './gu'
 import {setUpMandrel} from './mandrel'
-import {setUpLiberica} from './liberica'
 import {checkForUpdates} from './features/check-for-updates'
 import {setUpNativeImageMusl} from './features/musl'
 import {setUpWindowsEnvironment} from './msvc'
@@ -18,7 +17,6 @@ import {exec} from '@actions/exec'
 async function run(): Promise<void> {
  try {
    const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, {required: true})
-    const javaPackage = core.getInput(c.INPUT_JAVA_PACKAGE)
    const distribution = core.getInput(c.INPUT_DISTRIBUTION)
    const graalVMVersion = core.getInput(c.INPUT_VERSION)
    const gdsToken = core.getInput(c.INPUT_GDS_TOKEN)
@@ -32,15 +30,9 @@ async function run(): Promise<void> {
    const enableCheckForUpdates =
      core.getInput(c.INPUT_CHECK_FOR_UPDATES) === 'true'
    const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true'
-    const isGraalVMforJDK17OrLater =
-      distribution.length > 0 || graalVMVersion.length == 0

    if (c.IS_WINDOWS) {
-      setUpWindowsEnvironment(
-        javaVersion,
-        graalVMVersion,
-        isGraalVMforJDK17OrLater
-      )
+      setUpWindowsEnvironment(javaVersion, graalVMVersion)
    }
    await setUpDependencies(components)
    if (enableNativeImageMusl) {
@@ -48,6 +40,8 @@ async function run(): Promise<void> {
    }

    // Download GraalVM JDK
+    const isGraalVMforJDK17OrLater =
+      distribution.length > 0 || graalVMVersion.length == 0
    let graalVMHome
    if (isGraalVMforJDK17OrLater) {
      if (
@@ -59,7 +53,7 @@ async function run(): Promise<void> {
      }
      switch (distribution) {
        case c.DISTRIBUTION_GRAALVM:
-          graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion, gdsToken)
+          graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          break
        case c.DISTRIBUTION_GRAALVM_COMMUNITY:
          graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
@@ -67,9 +61,6 @@ async function run(): Promise<void> {
        case c.DISTRIBUTION_MANDREL:
          graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
          break
-        case c.DISTRIBUTION_LIBERICA:
-          graalVMHome = await setUpLiberica(javaVersion, javaPackage)
-          break
        case '':
          if (javaVersion === c.VERSION_DEV) {
            core.info(
@@ -80,7 +71,7 @@ async function run(): Promise<void> {
            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, gdsToken)
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          }
          break
        default:
@@ -98,7 +89,7 @@ async function run(): Promise<void> {
            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, gdsToken)
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          } else {
            graalVMHome = await graalvm.setUpGraalVMLatest_22_X(
              gdsToken,
@@ -119,7 +110,7 @@ async function run(): Promise<void> {
            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, gdsToken)
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          } else {
            graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
          }
@@ -160,15 +151,11 @@ async function run(): Promise<void> {
    if (cache && isCacheAvailable()) {
      await restore(cache)
    }
-    setUpNativeImageBuildReports(
-      isGraalVMforJDK17OrLater,
-      javaVersion,
-      graalVMVersion
-    )
+    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion)

    core.startGroup(`Successfully set up '${basename(graalVMHome)}'`)
    await exec(join(graalVMHome, 'bin', `java${c.EXECUTABLE_SUFFIX}`), [
-      javaVersion.startsWith('8') ? '-version' : '--version'
+      '--version'
    ])
    core.endGroup()
  } catch (error) {
--- a/src/msvc.ts
+++ b/src/msvc.ts
@@ -28,32 +28,20 @@ function findVcvarsallPath(): string {
  throw new Error('Failed to find vcvarsall.bat')
 }

-export function needsWindowsEnvironmentSetup(
-  javaVersion: string,
-  graalVMVersion: string,
-  isGraalVMforJDK17OrLater: boolean
-): boolean {
-  if (javaVersion === VERSION_DEV || graalVMVersion === VERSION_DEV) {
-    return false // no longer required in dev builds
-  } else if (isGraalVMforJDK17OrLater) {
-    return false // no longer required in GraalVM for JDK 17 and later.
-  }
-  return true
-}
-
 export function setUpWindowsEnvironment(
  javaVersion: string,
-  graalVMVersion: string,
-  isGraalVMforJDK17OrLater: boolean
+  graalVMVersion: string
 ): void {
+  if (javaVersion === javaVersion || graalVMVersion === VERSION_DEV) {
+    return // no longer required in dev builds
+  }
+  const javaVersionSemVer = semver.coerce(javaVersion)
  if (
-    !needsWindowsEnvironmentSetup(
-      javaVersion,
-      graalVMVersion,
-      isGraalVMforJDK17OrLater
-    )
+    javaVersionSemVer &&
+    semver.valid(javaVersionSemVer) &&
+    semver.gte(javaVersionSemVer, '18.0.0')
  ) {
-    return
+    return // no longer required in GraalVM for JDK 17 and later. JDK 17 builds from 22.3 still need this, so skip 17.X.X
  }

  core.startGroup('Updating Windows environment...')
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -65,7 +65,6 @@ export async function getContents(
 }

 export async function getTaggedRelease(
-  owner: string,
  repo: string,
  tag: string
 ): Promise<c.LatestReleaseResponse['data']> {
@@ -74,7 +73,7 @@ export async function getTaggedRelease(
  const octokit = new GitHubDotCom(options)
  return (
    await octokit.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', {
-      owner,
+      owner: c.GRAALVM_GH_USER,
      repo,
      tag
    })
@@ -82,8 +81,6 @@ export async function getTaggedRelease(
 }

 export async function getMatchingTags(
-  owner: string,
-  repo: string,
  tagPrefix: string
 ): Promise<c.MatchingRefsResponse['data']> {
  const githubToken = getGitHubToken()
@@ -93,8 +90,8 @@ export async function getMatchingTags(
    await octokit.request(
      'GET /repos/{owner}/{repo}/git/matching-refs/tags/{tagPrefix}',
      {
-        owner,
-        repo,
+        owner: c.GRAALVM_GH_USER,
+        repo: c.GRAALVM_RELEASES_REPO,
        tagPrefix
      }
    )
@@ -184,52 +181,6 @@ function getGitHubToken(): string {
  return core.getInput(c.INPUT_GITHUB_TOKEN)
 }

-export async function findExistingPRCommentId(
-  bodyStartsWith: string
-): Promise<number | undefined> {
-  if (!isPREvent()) {
-    throw new Error('Not a PR event.')
-  }
-
-  const context = github.context
-  const octokit = github.getOctokit(getGitHubToken())
-  try {
-    const comments = await octokit.paginate(octokit.rest.issues.listComments, {
-      ...context.repo,
-      issue_number: context.payload.pull_request?.number as number
-    })
-    const matchingComment = comments.reverse().find(comment => {
-      return comment.body && comment.body.startsWith(bodyStartsWith)
-    })
-    return matchingComment ? matchingComment.id : undefined
-  } catch (err) {
-    core.error(
-      `Failed to list pull request comments. Please make sure this job has 'write' permissions for the 'pull-requests' scope (see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions)? Internal error: ${err}`
-    )
-  }
-}
-
-export async function updatePRComment(
-  content: string,
-  commentId: number
-): Promise<void> {
-  if (!isPREvent()) {
-    throw new Error('Not a PR event.')
-  }
-
-  try {
-    await github.getOctokit(getGitHubToken()).rest.issues.updateComment({
-      ...github.context.repo,
-      comment_id: commentId,
-      body: content
-    })
-  } catch (err) {
-    core.error(
-      `Failed to update pull request comment. Please make sure this job has 'write' permissions for the 'pull-requests' scope (see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions)? Internal error: ${err}`
-    )
-  }
-}
-
 export async function createPRComment(content: string): Promise<void> {
  if (!isPREvent()) {
    throw new Error('Not a PR event.')
Author	SHA1	Message	Date
Fabio Niephaus	5c3001733f	Bump version to `1.1.8`.	2024-02-22 12:45:15 +01:00
Fabio Niephaus	bd9c75cac6	Report `java --version` when done. Fixes #81	2024-02-22 12:13:25 +01:00
Fabio Niephaus	0fee1abbca	Disable MSVC feature for javaVersion gte 18. Fixes #32.	2024-02-22 11:25:13 +01:00
Fabio Niephaus	ca91f399b9	Turn descriptions for versions & distros into list. [ci skip]	2024-02-22 11:11:07 +01:00
Fabio Niephaus	2e2e6f1823	Document support for Oracle GraalVM EA builds. [ci skip]	2024-02-22 10:53:11 +01:00
Fabio Niephaus	4a6d7d10cf	Derive javaVersion from downloadUrl. This ensures that `latest-ea` and `22-ea` can be cached based on the actual version number (e.g., `22.0.0`).	2024-02-22 10:24:27 +01:00
Fabio Niephaus	10650533bf	Use new Oracle GraalVM EA builds repo.	2024-02-21 10:40:50 +01:00