From 4bda14d50f7220fceec996543d801c4e2edfe52e Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Wed, 3 Jan 2024 16:39:30 +0100 Subject: [PATCH] Fix GraalVM integration test on GitHub Actions (#3626) Since gradle-build-action currently writes `~/.gradle/gradle.properties` which takes precedence over the project-local `gradle.properties`, the test now passes `org.gradle.java.installations.fromEnv` as a CLI arg. (cherry picked from commit 89ae12332705b95dd98d71a930d8443b3e252064) --- gradle.properties | 2 +- .../projects/graalvm-starter/gradle.properties | 1 - .../platform/tooling/support/tests/GraalVmStarterTests.java | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 platform-tooling-support-tests/projects/graalvm-starter/gradle.properties diff --git a/gradle.properties b/gradle.properties index 7750632ff21..cf21b97117c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED org.gradle.caching=true org.gradle.parallel=true -org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21,JDK22,GRAALVM_HOME +org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21,JDK22 org.gradle.kotlin.dsl.allWarningsAsErrors=true # Test Distribution diff --git a/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties b/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties deleted file mode 100644 index 83d0ce01114..00000000000 --- a/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.java.installations.fromEnv=GRAALVM_HOME diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java index ea477a382bb..7da00f860e9 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java @@ -41,6 +41,7 @@ void runsTestsInNativeImage() { .setProject("graalvm-starter") // .addArguments("-Dmaven.repo=" + MavenRepo.dir()) // .addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace") // + .addArguments("-Porg.gradle.java.installations.fromEnv=GRAALVM_HOME") // .setTimeout(Duration.ofMinutes(5)) // .build();