summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorNik Everett <nik9000@gmail.com>2017-06-16 17:16:03 -0400
committerNik Everett <nik9000@gmail.com>2017-06-16 17:19:14 -0400
commit21b1db2965285f7ae13f2a756e8e20719060d9d6 (patch)
treecdf5abb728dd7bf7fb855482730ae5ad1810e99f /plugins
parent0c697348f41e1ebdcf2396a95e48b6eccc50dd3b (diff)
Remove assemble from build task when assemble removed
Removes the `assemble` task from the `build` task when we have removed `assemble` from the project. We removed `assemble` from projects that aren't published so our releases will be faster. But That broke CI because CI builds with `gradle precommit build` and, it turns out, that `build` includes `check` and `assemble`. With this change CI will only run `check` for projects without an `assemble`.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/examples/build.gradle1
-rw-r--r--plugins/jvm-example/build.gradle4
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/examples/build.gradle b/plugins/examples/build.gradle
index 150e2826f3..47db55b3b3 100644
--- a/plugins/examples/build.gradle
+++ b/plugins/examples/build.gradle
@@ -4,6 +4,7 @@ gradle.projectsEvaluated {
Task assemble = project.tasks.findByName('assemble')
if (assemble) {
project.tasks.remove(assemble)
+ project.build.dependsOn.remove('assemble')
}
}
}
diff --git a/plugins/jvm-example/build.gradle b/plugins/jvm-example/build.gradle
index 5e4523adc0..78e54d8bc8 100644
--- a/plugins/jvm-example/build.gradle
+++ b/plugins/jvm-example/build.gradle
@@ -21,7 +21,9 @@ esplugin {
description 'Demonstrates all the pluggable Java entry points in Elasticsearch'
classname 'org.elasticsearch.plugin.example.JvmExamplePlugin'
}
-tasks.remove(assemble) // Not published so no need to assemble
+// Not published so no need to assemble
+tasks.remove(assemble)
+build.dependsOn.remove('assemble')
// no unit tests
test.enabled = false