Skip to content

Commit c72cb34

Browse files
committed
Make pullFixture a task dependency of resolveAllDependencies (#38956)
* Make pullFixture a task dependency of resolveAllDependencies With this change we will pull the docker test fixtures ( and thus cache the images ) for older versions too as the `resolveAllDependencies` is already being called on the bwc checkouts too.
1 parent ab89c67 commit c72cb34

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.ci/packer_cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ while [ -h "$SCRIPT" ] ; do
1616
done
1717

1818
source $(dirname "${SCRIPT}")/java-versions.properties
19-
JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA} ./gradlew --parallel resolveAllDependencies composePull
19+
JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA} ./gradlew --parallel resolveAllDependencies

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,10 @@ if (System.properties.get("build.compare") != null) {
623623

624624
allprojects {
625625
task resolveAllDependencies {
626-
doLast {
627-
configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
628-
}
626+
dependsOn tasks.matching { it.name == "pullFixture"}
627+
doLast {
628+
configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
629+
}
629630
}
630631
}
631632

0 commit comments

Comments
 (0)