Merge pull request #495 from dnestoro/dnestoro/RelaxGraalVMVersionCheck

Relax GraalVM version check for dev versions
graalvm · Sep 4, 2023 · 07e22c0 · 07e22c0
2 parents d6eedb6 + e6c0810
commit 07e22c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java b/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
@@ -122,7 +122,8 @@ public static void checkVersion(String requiredVersion, String versionToCheck) {
         if (versionToCheck.contains("GraalVM Runtime Environment")) {
             return; // later than 22.3.1 (e.g., GraalVM for JDK 17 / GraalVM for JDK 20)
         }
-        if (versionToCheck.startsWith("GraalVM dev") || versionToCheck.startsWith("native-image dev")) {
+        if ((versionToCheck.startsWith("native-image") && versionToCheck.contains("dev")) ||
+                versionToCheck.startsWith("GraalVM dev")) { /* For GraalVM 22.3 and earlier */
             return;
         }
         Matcher requiredMatcher = requiredVersionPattern.matcher(requiredVersion);

diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc
@@ -21,6 +21,8 @@ If you are using alternative build systems, see <<alternative-build-systems.adoc
 
 === Release 0.9.26
 
+* Relax GraalVM version check for dev versions
+
 ==== Gradle plugin
 
 * Fix compatibility with Gradle 8.3