Skip to content

Commit

Permalink
Don't build bwc on assemble (elastic#33372)
Browse files Browse the repository at this point in the history
Gradle triggers the build of artifacts even if assemble is disabled.
Most users will not need bwc distributions after running `./gradlew
assemble` so instead of forcing them to add `-x buildBwcVersion`, we
detect this and skip the configuration of the artifacts.
  • Loading branch information
alpar-t authored Sep 5, 2018
1 parent cfd3fa7 commit 9f96d2c
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions distribution/bwc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ subprojects {
apply plugin: 'distribution'
// Not published so no need to assemble
assemble.enabled = false
assemble.dependsOn.remove('buildBwcVersion')

File checkoutDir = file("${buildDir}/bwc/checkout-${bwcBranch}")

Expand Down Expand Up @@ -195,11 +196,19 @@ subprojects {
}
}

artifacts {
for (File artifactFile : artifactFiles) {
String artifactName = artifactFile.name.contains('oss') ? 'elasticsearch-oss' : 'elasticsearch'
String suffix = artifactFile.toString()[-3..-1]
'default' file: artifactFile, name: artifactName, type: suffix, builtBy: buildBwcVersion
if (gradle.startParameter.taskNames == ["assemble"]) {
// Gradle needs the `artifacts` declaration, including `builtBy` bellow to make projects dependencies on this
// project work, but it will also trigger the build of these for the `assemble` task.
// Since these are only used for testing, we don't want to assemble them if `assemble` is the single command being
// ran.
logger.info("Skipping BWC builds since `assemble` is the only task name provided on the command line")
} else {
artifacts {
for (File artifactFile : artifactFiles) {
String artifactName = artifactFile.name.contains('oss') ? 'elasticsearch-oss' : 'elasticsearch'
String suffix = artifactFile.toString()[-3..-1]
'default' file: artifactFile, name: artifactName, type: suffix, builtBy: buildBwcVersion
}
}
}
}
Expand Down

0 comments on commit 9f96d2c

Please sign in to comment.