From 0e29e36dce77b07eb899abac809c2fce9d60c140 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 6 Sep 2023 10:37:50 +0200
Subject: [PATCH] Fix version check for gu and add a better warning.

---
 .github/workflows/test.yml |  4 ++++
 dist/main/index.js         |  9 +++++++--
 src/gu.ts                  | 18 ++++++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b66082c..781c476 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,10 @@ jobs:
           - java-version: 'dev'
             distribution: ''
             os: windows-latest
+          - java-version: '17.0.7'
+            distribution: 'graalvm-community'
+            os: ubuntu-latest
+            components: 'native-image' # should print a warning but not fail
     steps:
       - uses: actions/checkout@v3
       - name: Run setup-graalvm action
diff --git a/dist/main/index.js b/dist/main/index.js
index a3765d4..caefa0a 100644
--- a/dist/main/index.js
+++ b/dist/main/index.js
@@ -71269,8 +71269,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(',')}'`);
diff --git a/src/gu.ts b/src/gu.ts
index b3c9039..0d9dac8 100644
--- a/src/gu.ts
+++ b/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(',')}'`