Skip to content

Commit

Permalink
Support GraalVM 20.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gwenneg committed Feb 20, 2020
1 parent 2d4253a commit 6436935
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/native-cron-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: sudo systemctl stop mysql

- name: Pull docker image
run: docker pull quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java${{ matrix.java }}
run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java${{ matrix.java }}

- name: Set up Java
uses: actions/setup-java@v1
Expand All @@ -42,7 +42,7 @@ jobs:
run: mvn -B install -DskipTests -DskipITs -Dno-format

- name: Run integration tests in native
run: mvn -B --settings azure-mvn-settings.xml verify -f integration-tests/pom.xml -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-dynamodb -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test"
run: mvn -B --settings azure-mvn-settings.xml verify -f integration-tests/pom.xml -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-dynamodb -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test"

- name: Report
if: always()
Expand Down
2 changes: 1 addition & 1 deletion bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<maven-plugin-annotations.version>3.5.2</maven-plugin-annotations.version>
<plexus-component-annotations.version>1.7.1</plexus-component-annotations.version>
<!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
<graal-sdk.version>19.3.1</graal-sdk.version>
<graal-sdk.version>20.0.0</graal-sdk.version>
<gizmo.version>1.0.2.Final</gizmo.version>
<jackson.version>2.10.2</jackson.version>
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- These properties are needed in order for them to be resolvable by the documentation -->
<!-- The Graal version we suggest using in documentation - as that's
what we work with by self downloading it: -->
<graal-sdk.version-for-documentation>19.3.1</graal-sdk.version-for-documentation>
<graal-sdk.version-for-documentation>20.0.0</graal-sdk.version-for-documentation>
<rest-assured.version>4.1.1</rest-assured.version>
<axle-client.version>0.0.12</axle-client.version>
<mutiny-client.version>0.0.12</mutiny-client.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public class NativeConfig {
/**
* The docker image to use to do the image build
*/
@ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java8")
@ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java8")
public String builderImage;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,11 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa

private void checkGraalVMVersion(String version) {
log.info("Running Quarkus native-image plugin on " + version);
final List<String> obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.", "19.3.0");
final List<String> obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.", "19.3.");
final boolean vmVersionIsObsolete = obsoleteGraalVmVersions.stream().anyMatch(v -> version.contains(" " + v));
if (vmVersionIsObsolete) {
throw new IllegalStateException(
"Out of date version of GraalVM detected: " + version + ". Please upgrade to GraalVM 19.3.1.");
"Out of date version of GraalVM detected: " + version + ". Please upgrade to GraalVM 20.0.0.");
}
}

Expand Down

0 comments on commit 6436935

Please sign in to comment.