Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle GraalVM 23.1 dev builds based on OpenJDK #43716

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Handle GraalVM 23.1 dev builds based on OpenJDK #43716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/GraalVMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,20 @@ public void testGraalVMEA24DevVersionParser() {
assertThat(graalVMEA24Dev.javaVersion.update()).isEqualTo(0);
}

@Test
public void testGraalVM23_1CommunityVersionParser() {
final Version version = Version.of(Stream.of(("native-image 21.0.5-beta 2024-10-15\n"
+ "GraalVM Runtime Environment GraalVM CE 21.0.5-dev.beta+3.1 (build 21.0.5-beta+3-ea)\n"
+ "Substrate VM GraalVM CE 21.0.5-dev.beta+3.1 (build 21.0.5-beta+3-ea, serial gc)")
.split("\\n")));
assertThat(version.toString().contains(GRAALVM.name()));
assertThat(version.getVersionAsString()).isEqualTo("23.1-dev");
assertThat(version.javaVersion.toString()).isEqualTo("21.0.5-beta+3-ea");
assertThat(version.javaVersion.feature()).isEqualTo(21);
assertThat(version.javaVersion.interim()).isEqualTo(0);
assertThat(version.javaVersion.update()).isEqualTo(5);
}

@Test
public void testGraalVMVersionsOlderThan() {
assertOlderThan("GraalVM Version 19.3.6 CE", "GraalVM Version 20.2.0 (Java Version 11.0.9)");
Expand Down
4 changes: 3 additions & 1 deletion core/runtime/src/main/java/io/quarkus/runtime/graal/GraalVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ public static class Version implements Comparable<Version> {
// Temporarily work around https://github.com/quarkusio/quarkus/issues/36246,
// till we have a consensus on how to move forward in
// https://github.com/quarkusio/quarkus/issues/34161
protected static final Map<String, String> GRAAL_MAPPING = Map.of("22", "24.0",
protected static final Map<String, String> GRAAL_MAPPING = Map.of(
"21", "23.1",
"22", "24.0",
"23", "24.1",
"24", "24.2",
"25", "25.0");
Expand Down
Loading