Relax GraalVM version check for dev versions #495
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oracle-contributor-agreement
bot
added
the
OCA Verified
fniephaus
approved these changes
Sep 1, 2023
common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
Outdated
Show resolved
Hide resolved
fniephaus
requested changes
Sep 1, 2023
common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
Outdated
Show resolved
Hide resolved
melix
approved these changes
Sep 1, 2023
| @@ -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+")) || | |||
There was a problem hiding this comment.
I would change -dev+ to just dev. We should try to be future-proof, i.e., we don't want to adapt this change any time the version string of GraalVM changes.
Maybe even reduce the whole check to just if (versionToCheck.contains("dev")) {.
…ImageUtils.java Co-authored-by: Fabio Niephaus <code@fniephaus.com>
dnestoro
force-pushed
the
dnestoro/RelaxGraalVMVersionCheck
branch
from
f453d7a to
e6c0810
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.