Bump version to 1.1.4.

.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

.github/workflows/test.yml

@@ -15,7 +15,7 @@ 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: |
@@ -25,18 +25,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java-version: ['17', '20', 'dev']
+        java-version: ['21', '17', '20', 'dev']
         distribution: ['graalvm', 'graalvm-community']
         os: [macos-latest, windows-latest, ubuntu-latest]
         include:
-          - java-version: '17.0.7'
+          - 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
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run setup-graalvm action
         uses: ./
         with:
@@ -95,7 +99,7 @@ jobs:
             components: 'native-image'
             os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run setup-graalvm action
         uses: ./
         with:
@@ -148,7 +152,7 @@ jobs:
             components: 'native-image'
             os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run setup-graalvm action
         uses: ./
         with:
@@ -195,7 +199,7 @@ jobs:
             java-version: '17'
             os: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run setup-graalvm action
         uses: ./
         with:
@@ -226,7 +230,7 @@ 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:
@@ -248,7 +252,7 @@ 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:
@@ -270,7 +274,7 @@ 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:
@@ -293,7 +297,7 @@ 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:
@@ -328,16 +332,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 nodejs python ruby wasm

README.md

@@ -17,7 +17,7 @@ This action:
 
 ## Migrating from GraalVM 22.3 or Earlier to the New GraalVM for JDK 17 and Later
 
-The new [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.
+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:
@@ -54,10 +54,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17.0.7'
+          java-version: '21'
           distribution: 'graalvm' # See 'Options' for all available distributions
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Example step
@@ -85,11 +85,11 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17.0.7'
+          java-version: '21'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           native-image-job-reports: 'true'
@@ -118,7 +118,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.2' # GraalVM version
@@ -146,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'
@@ -166,7 +166,7 @@ jobs:
 
 | Name            | Default  | Description |
 |-----------------|:--------:|-------------|
-| `java-version`<br>*(required)* | n/a | `'17.0.7'` or `'20.0.1'` 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.) |
+| `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`. |

dist/main/index.js

@@ -70322,9 +70322,13 @@ exports.checkForUpdates = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 function checkForUpdates(graalVMVersion, javaVersion) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (javaVersion === '20') {
+            core.notice('A new GraalVM release is available! Please consider upgrading to GraalVM for JDK 21: https://medium.com/p/ee01177dd12d');
+            return;
+        }
         if (graalVMVersion.length > 0 &&
             (javaVersion === '17' || javaVersion === '19')) {
-            const recommendedJDK = javaVersion === '17' ? '17' : '20';
+            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;
         }
@@ -70824,7 +70828,7 @@ const assert_1 = __nccwpck_require__(9491);
 const uuid_1 = __nccwpck_require__(5840);
 function downloadGraalVMEELegacy(gdsToken, version, javaVersion) {
     return __awaiter(this, void 0, void 0, function* () {
-        const userAgent = `GraalVMGitHubAction/1.1.3 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`;
+        const userAgent = `GraalVMGitHubAction/1.1.4 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`;
         const baseArtifact = yield fetchArtifact(userAgent, 'isBase:True', version, javaVersion);
         return downloadArtifact(gdsToken, userAgent, baseArtifact);
     });
@@ -71269,8 +71273,13 @@ function setUpGUComponents(javaVersion, graalVMVersion, graalVMHome, components,
         }
         if (graalVMVersion === c.VERSION_DEV ||
             javaVersion === c.VERSION_DEV ||
-            ((0, semver_1.valid)(javaVersion) && (0, semver_1.gte)(javaVersion, '21'))) {
-            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`);
+            ((0, semver_1.valid)(javaVersion) && (0, semver_1.gte)(javaVersion, '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(',')}'`);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "setup-graalvm",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-graalvm",
-      "version": "1.1.3",
+      "version": "1.1.4",
       "license": "UPL",
       "dependencies": {
         "@actions/cache": "^3.0.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-graalvm",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "private": true,
   "description": "GitHub Action for GraalVM",
   "main": "lib/main.js",

src/features/check-for-updates.ts

@@ -4,11 +4,17 @@ export async function checkForUpdates(
   graalVMVersion: string,
   javaVersion: string
 ): Promise<void> {
+  if (javaVersion === '20') {
+    core.notice(
+      'A new GraalVM release is available! Please consider upgrading to GraalVM for JDK 21: https://medium.com/p/ee01177dd12d'
+    )
+    return
+  }
   if (
     graalVMVersion.length > 0 &&
     (javaVersion === '17' || javaVersion === '19')
   ) {
-    const recommendedJDK = javaVersion === '17' ? '17' : '20'
+    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`
     )

src/gds.ts

@@ -32,7 +32,7 @@ export async function downloadGraalVMEELegacy(
   version: string,
   javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/1.1.3 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const userAgent = `GraalVMGitHubAction/1.1.4 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
   const baseArtifact = await fetchArtifact(
     userAgent,
     'isBase:True',

src/gu.ts

@@ -37,13 +37,19 @@ export async function setUpGUComponents(
   if (
     graalVMVersion === c.VERSION_DEV ||
     javaVersion === c.VERSION_DEV ||
-    (semverValid(javaVersion) && semverGte(javaVersion, '21'))
+    (semverValid(javaVersion) && semverGte(javaVersion, '21.0.0'))
   ) {
-    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`
-    )
+    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(',')}'`