From 39f0864c231d44724f230e03e2e883fd2023deeb Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Sun, 15 Dec 2024 09:46:35 +0100 Subject: [PATCH] Update configuration cache validation --- .buildkite/pipelines/pull-request/part-4.yml | 2 +- .buildkite/scripts/gradle-configuration-cache-validation.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipelines/pull-request/part-4.yml b/.buildkite/pipelines/pull-request/part-4.yml index a19d61e7792e7..af11f08953d07 100644 --- a/.buildkite/pipelines/pull-request/part-4.yml +++ b/.buildkite/pipelines/pull-request/part-4.yml @@ -2,7 +2,7 @@ config: skip-target-branches: "7.17" steps: - label: part-4 - command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart4 --configuration-cache --stacktrace + command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart4 timeout_in_minutes: 300 agents: provider: gcp diff --git a/.buildkite/scripts/gradle-configuration-cache-validation.sh b/.buildkite/scripts/gradle-configuration-cache-validation.sh index 55a4b18a1e887..2257b4cfb17a5 100755 --- a/.buildkite/scripts/gradle-configuration-cache-validation.sh +++ b/.buildkite/scripts/gradle-configuration-cache-validation.sh @@ -3,16 +3,16 @@ set -euo pipefail # This is a workaround for https://github.com/gradle/gradle/issues/28159 -.ci/scripts/run-gradle.sh --no-daemon precommit +.ci/scripts/run-gradle.sh --no-daemon $@ -.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 +.ci/scripts/run-gradle.sh --configuration-cache -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 $@ # Create a temporary file tmpOutputFile=$(mktemp) trap "rm $tmpOutputFile" EXIT echo "2nd run" -.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile +.ci/scripts/run-gradle.sh --configuration-cache -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 $@ | tee $tmpOutputFile # Check if the command was successful if grep -q "Configuration cache entry reused." $tmpOutputFile; then