You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/01/13 22:35:48 UTC
(solr) branch Build-validation.git.failOnModified-default-to-isCIBuild created (now 2586b7cc6ea)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch Build-validation.git.failOnModified-default-to-isCIBuild
in repository https://gitbox.apache.org/repos/asf/solr.git
at 2586b7cc6ea Build: validation.git.failOnModified default to isCIBuild
This branch includes the following new commits:
new 2586b7cc6ea Build: validation.git.failOnModified default to isCIBuild
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(solr) 01/01: Build: validation.git.failOnModified default to isCIBuild
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch Build-validation.git.failOnModified-default-to-isCIBuild
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 2586b7cc6eac9a2a3ed75ee11e215a39d1da9fda
Author: David Smiley <ds...@apache.org>
AuthorDate: Sat Jan 13 17:22:24 2024 -0500
Build: validation.git.failOnModified default to isCIBuild
---
gradle/globals.gradle | 2 +-
gradle/validation/git-status.gradle | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gradle/globals.gradle b/gradle/globals.gradle
index f08a033b118..48131b3003b 100644
--- a/gradle/globals.gradle
+++ b/gradle/globals.gradle
@@ -168,6 +168,6 @@ allprojects {
// detect if we run in CI environment by looking at existence of env vars:
// "CI": Github (https://docs.github.com/en/actions/learn-github-actions/environment-variables)
// anything starting with "JENKINS_" or "HUDSON_": Jenkins/Hudson (https://jenkins.thetaphi.de/env-vars.html/)
- isCIBuild = System.getenv().keySet().find { it ==~ /(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ } != null
+ isCIBuild = System.getenv().keySet().any { it ==~ /(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ }
}
}
diff --git a/gradle/validation/git-status.gradle b/gradle/validation/git-status.gradle
index 5ce6195bf93..b34cf831ef7 100644
--- a/gradle/validation/git-status.gradle
+++ b/gradle/validation/git-status.gradle
@@ -103,8 +103,18 @@ configure(rootProject) {
files.collect {file -> " - ${file} ${fileStatus}" }
}.sort()
- def checkProp = "validation.git.failOnModified"
- failOrWarn(checkProp, "Working copy is not a clean git checkout", offenders)
+ if (offenders ) {
+ def propName = "validation.git.failOnModified"
+ def shouldFail = Boolean.valueOf(propertyOrDefault(propName, isCIBuild))
+ def msg = "Working copy is not a clean git checkout" +
+ (shouldFail ? " (skip with -P${propName}=false)" : "") + ":\n${offenders.join("\n")}"
+
+ if (shouldFail) {
+ throw new GradleException(msg)
+ } else {
+ logger.warn("NOTE: ${msg}")
+ }
+ }
}
}
}