Skip to content

Commit 6bc1e12

Browse files
authored
[CI] Handle caching bwc dependencies more gracefully (#135417)
We need to adjust the task dependencies for bwc builds not to be hardcoded. Not all bwc projects always carry a buildBwcLinuxTar task.
1 parent cbe37a4 commit 6bc1e12

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

build.gradle

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -338,18 +338,13 @@ allprojects {
338338
tasks.register('resolveAllDependencies', ResolveAllDependencies) {
339339
def ignoredPrefixes = [DistributionDownloadPlugin.ES_DISTRO_CONFIG_PREFIX, "jdbcDriver"]
340340
configs = project.configurations.matching { config -> ignoredPrefixes.any { config.name.startsWith(it) } == false }
341+
341342
if (project.path == ':') {
342343
resolveJavaToolChain = true
343-
344-
// ensure we have best possible caching of bwc builds
345-
dependsOn ":distribution:bwc:major1:buildBwcLinuxTar"
346-
dependsOn ":distribution:bwc:major2:buildBwcLinuxTar"
347-
dependsOn ":distribution:bwc:major3:buildBwcLinuxTar"
348-
dependsOn ":distribution:bwc:major4:buildBwcLinuxTar"
349-
dependsOn ":distribution:bwc:minor1:buildBwcLinuxTar"
350-
dependsOn ":distribution:bwc:minor2:buildBwcLinuxTar"
351-
dependsOn ":distribution:bwc:minor3:buildBwcLinuxTar"
352-
dependsOn ":distribution:bwc:minor4:buildBwcLinuxTar"
344+
}
345+
// ensure we have best possible caching of bwc builds
346+
if(project.path.startsWith(":distribution:bwc:")) {
347+
dependsOn project.tasks.matching { it.name == 'buildBwcLinuxTar' }
353348
}
354349
if (project.path.contains("fixture")) {
355350
dependsOn tasks.withType(ComposePull)

0 commit comments

Comments
 (0)