Skip to content

Commit 30e8596

Browse files
breskebyalexey-ivanov-es
authored andcommitted
[Gradle] Minor cleanup on cache validation script (elastic#116893)
Some minor cleanup in ci build for configuration cache validation
1 parent c254904 commit 30e8596

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.buildkite/scripts/gradle-configuration-cache-validation.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
set -euo pipefail
44

5-
# TODO/ FIXIT without a full resolved gradle home, we see issues configuration cache reuse
6-
./gradlew --max-workers=8 --parallel --scan --no-daemon precommit
5+
# This is a workaround for https://github.com/gradle/gradle/issues/28159
6+
.ci/scripts/run-gradle.sh --no-daemon precommit
77

8-
./gradlew --max-workers=8 --parallel --scan --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2
8+
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2
99

1010
# Create a temporary file
1111
tmpOutputFile=$(mktemp)
1212
trap "rm $tmpOutputFile" EXIT
1313

1414
echo "2nd run"
15-
# TODO run-gradle.sh script causes issues because of init script handling
16-
./gradlew --max-workers=8 --parallel --scan --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile
15+
.ci/scripts/run-gradle.sh --configuration-cache precommit -Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=build/*.tar.bz2 | tee $tmpOutputFile
1716

1817
# Check if the command was successful
1918
if grep -q "Configuration cache entry reused." $tmpOutputFile; then

0 commit comments

Comments
 (0)