added support for graalvm version strings without minor version #1234
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
kristofdho
reviewed
Nov 10, 2023
src/test/java/com/gluonhq/substrate/model/InternalProjectConfigurationTest.java
Show resolved
Hide resolved
jperedadnr
reviewed
Nov 15, 2023
| Arguments.of(new Version("21.0.1"), new Version("21.0.1"), "java version \"21.0.1\" 2023-10-17\n" + | ||
| "Java(TM) SE Runtime Environment Oracle GraalVM 21.0.1+12.1 (build 21.0.1+12-jvmci-23.1-b19)\n" + | ||
| "Java HotSpot(TM) 64-Bit Server VM Oracle GraalVM 21.0.1+12.1 (build 21.0.1+12-jvmci-23.1-b19, mixed mode, sharing)"), | ||
|
|
There was a problem hiding this comment.
Minor: add a comment about GraalVM CE builds?
There was a problem hiding this comment.
I've tested against recent GraalVM 21, the changes from this PR are fine, but to complete the build it needs the changes from #1236
There was a problem hiding this comment.
@kristofdho we'll integrate this PR before yours. Would be good if you can do another review?
jperedadnr
approved these changes
Nov 15, 2023
3 tasks
jperedadnr
requested review from
jperedadnr and
tiainen
and removed request for
johanvos and
kristofdho
kkriske
approved these changes
Nov 19, 2023
There was a problem hiding this comment.
LGTM
I might still look into removing code duplication in #1236 after this is merged, since both version parsers are running java -version. After my PR these are stored in the constructor so makes sense to only call that once.
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.
Substrate currently fails for some GraalVM builds that print versions without minor revision numbers, e.g.,
graalvm-jdk-21+35.1/bin/java -versionjava version "21" 2023-09-19 Java(TM) SE Runtime Environment Oracle GraalVM 21+35.1 (build 21+35-jvmci-23.1-b15) Java HotSpot(TM) 64-Bit Server VM Oracle GraalVM 21+35.1 (build 21+35-jvmci-23.1-b15, mixed mode, sharing)This PR changes the Regex from
GraalVM .*?(\d\d.\d.\d)toGraalVM (\d{1,2}(\.\d+){0,2})(same as for the Java version) and adds unit tests for a variety of old and new GraalVM builds on different platformsCurrent Regex
GraalVM .*?(\d\d.\d.\d)
Updated Regex
GraalVM (\d{1,2}(.\d+){0,2})