From 30a5e3a4ece5fd9127acbe99b291bc3d660f73d2 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Thu, 3 Oct 2024 16:16:19 +0100 Subject: [PATCH] Correct Gradle version for test. Quieten test logging. Add Gradle 8.8 to CI --- .github/workflows/gradle.yml | 2 +- ...nTelemetryJavaInstrumentationProjectFunctionalTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6dd679cb..44470883 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - gradle: [4.10.3, "5.0", 5.1.1, 5.2.1, 5.3.1, 5.4.1, 5.5.1, 5.6.4, 6.0.1, 6.1.1, 6.2.2, 6.3, 6.4.1, 6.5.1, 6.6.1, 6.7.1, 6.8.3, 6.9.4, 7.0.2, 7.1.1, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.3, 8.0.2, 8.1.1, 8.2.1, 8.3, 8.4, 8.5, "8.10.2"] + gradle: [4.10.3, "5.0", 5.1.1, 5.2.1, 5.3.1, 5.4.1, 5.5.1, 5.6.4, 6.0.1, 6.1.1, 6.2.2, 6.3, 6.4.1, 6.5.1, 6.6.1, 6.7.1, 6.8.3, 6.9.4, 7.0.2, 7.1.1, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.3, 8.0.2, 8.1.1, 8.2.1, 8.3, 8.4, 8.5, 8.8, "8.10.2"] # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'pull_request' runs-on: ubuntu-latest diff --git a/manipulation/src/functTest/java/org/jboss/gm/manipulation/OpenTelemetryJavaInstrumentationProjectFunctionalTest.java b/manipulation/src/functTest/java/org/jboss/gm/manipulation/OpenTelemetryJavaInstrumentationProjectFunctionalTest.java index 84e815f0..a0cab930 100644 --- a/manipulation/src/functTest/java/org/jboss/gm/manipulation/OpenTelemetryJavaInstrumentationProjectFunctionalTest.java +++ b/manipulation/src/functTest/java/org/jboss/gm/manipulation/OpenTelemetryJavaInstrumentationProjectFunctionalTest.java @@ -25,7 +25,7 @@ public class OpenTelemetryJavaInstrumentationProjectFunctionalTest { @Rule - public final SystemOutRule systemOutRule = new SystemOutRule().enableLog();//.muteForSuccessfulTests(); + public final SystemOutRule systemOutRule = new SystemOutRule().enableLog().muteForSuccessfulTests(); @Rule public TemporaryFolder tempDir = new TemporaryFolder(); @@ -40,7 +40,7 @@ public static void setupJVM() throws IOException { @Test public void testOpenTelemetryJavaInstrumentation() throws IOException, URISyntaxException, GitAPIException { - assumeTrue(GradleVersion.current().compareTo(GradleVersion.version("8.0")) >= 0); + assumeTrue(GradleVersion.current().compareTo(GradleVersion.version("8.8")) >= 0); final File opentelemetryProjectRoot = tempDir.newFolder("opentelemetry-java-instrumentation-project"); @@ -60,7 +60,8 @@ public void testOpenTelemetryJavaInstrumentation() throws IOException, URISyntax final BuildResult buildResult = TestUtils.createGradleRunner() .withProjectDir(opentelemetryProjectRoot) - .withArguments("-Potel.stable=true", "-Dorg.gradle.java.home=" + JDK17_DIR, "publish", "-x", "test") + .withArguments("-q", "-Potel.stable=true", "-Dorg.gradle.java.home=" + JDK17_DIR, "publish", "-x", "test", "-x", + "spotlessCheck", "-x", "checkstyleMain", "-x", "javadoc") .forwardOutput() .withDebug(false) .withPluginClasspath()