From 84f0d90a4e8665175fd6255b5d6518a070bc6b4c Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Tue, 16 Jul 2019 16:22:28 +0100 Subject: [PATCH 1/4] Don't cache test tasks --- .../groovy/com/palantir/baseline/plugins/BaselineTesting.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java index 7601a6583..96fb605c1 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java @@ -47,6 +47,9 @@ public void apply(Project project) { .findAny() .ifPresent(ignored -> enableJUnit5ForAllTestTasks(project)); }); + + // Never cache test tasks, until we work out the correct inputs for ETE / integration tests + project.getTasks().withType(Test.class).configureEach(test -> test.getOutputs().cacheIf(task -> false)); }); } From 544a3cfbaea766ea5166d7f0b3adafaf63bf3b4e Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Tue, 16 Jul 2019 16:47:56 +0100 Subject: [PATCH 2/4] consolidate --- .../com/palantir/baseline/plugins/BaselineTesting.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java index 96fb605c1..d28837082 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java @@ -30,8 +30,11 @@ public final class BaselineTesting implements Plugin { @Override public void apply(Project project) { - project.getTasks().withType(Test.class).all(task -> { + project.getTasks().withType(Test.class).configureEach(task -> { task.jvmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CrashOnOutOfMemoryError"); + + // Never cache test tasks, until we work out the correct inputs for ETE / integration tests + task.getOutputs().cacheIf(t -> false); }); project.getPlugins().withType(JavaPlugin.class, p -> { @@ -47,9 +50,6 @@ public void apply(Project project) { .findAny() .ifPresent(ignored -> enableJUnit5ForAllTestTasks(project)); }); - - // Never cache test tasks, until we work out the correct inputs for ETE / integration tests - project.getTasks().withType(Test.class).configureEach(test -> test.getOutputs().cacheIf(task -> false)); }); } From b04b7f191e7dec35c0066e1ccea81dab97125d78 Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Tue, 16 Jul 2019 16:57:33 +0100 Subject: [PATCH 3/4] property --- .../com/palantir/baseline/plugins/BaselineTesting.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java index d28837082..ea1117c5d 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineTesting.java @@ -33,8 +33,10 @@ public void apply(Project project) { project.getTasks().withType(Test.class).configureEach(task -> { task.jvmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CrashOnOutOfMemoryError"); - // Never cache test tasks, until we work out the correct inputs for ETE / integration tests - task.getOutputs().cacheIf(t -> false); + if (!Objects.equals("true", project.findProperty("com.palantir.baseline.restore-test-cache"))) { + // Never cache test tasks, until we work out the correct inputs for ETE / integration tests + task.getOutputs().cacheIf(t -> false); + } }); project.getPlugins().withType(JavaPlugin.class, p -> { From 54290744f4acd29ccad6ee703f026dd30383e91b Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Tue, 16 Jul 2019 16:59:01 +0100 Subject: [PATCH 4/4] changelog --- changelog/@unreleased/pr-694.v2.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/@unreleased/pr-694.v2.yml diff --git a/changelog/@unreleased/pr-694.v2.yml b/changelog/@unreleased/pr-694.v2.yml new file mode 100644 index 000000000..d2680fd99 --- /dev/null +++ b/changelog/@unreleased/pr-694.v2.yml @@ -0,0 +1,7 @@ +type: improvement +improvement: + description: | + Don't cache test tasks in the build cache by default. + It's possible to restore caching by adding `com.palantir.baseline.restore-test-cache = true` to your `gradle.properties`. + links: + - https://github.com/palantir/gradle-baseline/pull/694