Apache Solr open-source search software
Build: validation.git.failOnModified default to isCIBuild (#2196)
David Smileyb5db17916491
diff --git a/gradle/globals.gradle b/gradle/globals.gradleindex 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.gradleindex 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}")+ }+ }}}}