You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/01/27 16:34:26 UTC
[lucene-solr] branch master updated: LUCENE-9179: don't invoke the
same build recursively upon first run,
just continue. Seems like gradle bug but let's not cry about it - it just
happens once and CI defaults can be passed independently on command-line.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new b420ef8 LUCENE-9179: don't invoke the same build recursively upon first run, just continue. Seems like gradle bug but let's not cry about it - it just happens once and CI defaults can be passed independently on command-line.
b420ef8 is described below
commit b420ef8f77209690dcd47e45700a952409ccac62
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Mon Jan 27 17:34:13 2020 +0100
LUCENE-9179: don't invoke the same build recursively upon first run, just continue. Seems like gradle bug but let's not cry about it - it just happens once and CI defaults can be passed independently on command-line.
---
gradle/generate-defaults.gradle | 78 +++++++++++++++--------------------------
1 file changed, 29 insertions(+), 49 deletions(-)
diff --git a/gradle/generate-defaults.gradle b/gradle/generate-defaults.gradle
index 848176d..cecd5bd 100644
--- a/gradle/generate-defaults.gradle
+++ b/gradle/generate-defaults.gradle
@@ -4,48 +4,37 @@
def hasDefaults = rootProject.file("gradle.properties").exists()
-// If we don't have the defaults yet, create them and re-run the build
-// recursively with the same parameters as originally passed.
-//
-// Sadly, the recursive build doesn't seem to pick up the parallelism
-// tweaks from gradle.properties file.
+// If we don't have the defaults yet, create them.
if (!hasDefaults) {
configure(rootProject) {
- task setupLocalDefaultsOnce(type: GradleBuild) {
- // Approximate a common-sense default for running gradle/tests with parallel
- // workers: half the count of available cpus but not more than 12.
- def cpus = Runtime.runtime.availableProcessors()
- def maxWorkers = (int) Math.max(1d, Math.min(cpus * 0.5d, 12))
- def testsJvms = (int) Math.max(1d, Math.min(cpus * 0.5d, 12))
-
- // Reuse the same set of parameters for the recursive invocation and apply
- // some of these eagerly.
- def startParams = gradle.startParameter.newInstance()
- startParams.setParallelProjectExecutionEnabled(true)
- startParams.setMaxWorkerCount(maxWorkers)
- startParameter(startParams)
-
- // Write the defaults for this machine.
- rootProject.file("gradle.properties").write(
- [
- "# These settings have been generated automatically on the first run.",
- "# See gradlew :helpLocalSettings for more information.",
- "systemProp.file.encoding=UTF-8",
- "org.gradle.daemon=true",
- "org.gradle.jvmargs=-Xmx2g",
- "org.gradle.parallel=true",
- "org.gradle.priority=normal",
- "org.gradle.warning.mode=none", // Silence gradle warnings. We'll deal with them when we upgrade the wrapper.
- "",
- "# Maximum number of parallel gradle workers.",
- "org.gradle.workers.max=${maxWorkers}",
- "",
- "# Maximum number of test JVMs forked per test task.",
- "tests.jvms=${testsJvms}"
- ].join("\n"), "UTF-8")
-
+ task localSettings() {
doFirst {
+ // Approximate a common-sense default for running gradle/tests with parallel
+ // workers: half the count of available cpus but not more than 12.
+ def cpus = Runtime.runtime.availableProcessors()
+ def maxWorkers = (int) Math.max(1d, Math.min(cpus * 0.5d, 12))
+ def testsJvms = (int) Math.max(1d, Math.min(cpus * 0.5d, 12))
+
+ // Write the defaults for this machine.
+ rootProject.file("gradle.properties").write(
+ [
+ "# These settings have been generated automatically on the first run.",
+ "# See gradlew :helpLocalSettings for more information.",
+ "systemProp.file.encoding=UTF-8",
+ "org.gradle.daemon=true",
+ "org.gradle.jvmargs=-Xmx2g",
+ "org.gradle.parallel=true",
+ "org.gradle.priority=normal",
+ "org.gradle.warning.mode=none", // Silence gradle warnings. We'll deal with them when we upgrade the wrapper.
+ "",
+ "# Maximum number of parallel gradle workers.",
+ "org.gradle.workers.max=${maxWorkers}",
+ "",
+ "# Maximum number of test JVMs forked per test task.",
+ "tests.jvms=${testsJvms}"
+ ].join("\n"), "UTF-8")
+
logger.log(LogLevel.WARN, "\nIMPORTANT. This is the first time you ran the build. " +
"I wrote some sane defaults (for this machine) to 'gradle.properties', " +
"they will be picked up on consecutive gradle invocations (not this one).\n\n" +
@@ -54,20 +43,11 @@ if (!hasDefaults) {
}
}
- // Disable any tasks in this build, they were forked recursively.
- gradle.taskGraph.whenReady { graph ->
- graph.allTasks.each { task ->
- if (task != rootProject.setupLocalDefaultsOnce) {
- task.enabled = false
- }
- }
- }
-
// Make all tasks depend on local setup to make sure it'll run.
allprojects {
tasks.all { task ->
- if (task != rootProject.setupLocalDefaultsOnce) {
- task.dependsOn rootProject.setupLocalDefaultsOnce
+ if (task != rootProject.localSettings) {
+ task.dependsOn rootProject.localSettings
}
}
}