Merge pull request #5384 from bjhargrave/ci-scan-update

ci: Only accept gradle build scan TOS on CI builds
bndtools · Sep 29, 2022 · 26511a7 · 26511a7
2 parents a68260a + 5c121ad
commit 26511a7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/gradle-plugins/settings.gradle.kts b/gradle-plugins/settings.gradle.kts
@@ -1,7 +1,22 @@
 pluginManagement {
 	plugins {
-		id("com.gradle.plugin-publish") version "1.0.0"
-		id("dev.hargrave.addmavendescriptor") version "1.0.0"
+		id("com.gradle.plugin-publish") version("1.0.0")
+		id("dev.hargrave.addmavendescriptor") version("1.0.0")
+		id("com.gradle.enterprise") version("3.11.1")
+	}
+}
+
+plugins {
+	id("com.gradle.enterprise")
+}
+
+if (System.getenv("CI").toBoolean()) {
+	gradleEnterprise {
+		buildScan {
+			publishAlways()
+			termsOfServiceUrl = "https://gradle.com/terms-of-service"
+			termsOfServiceAgree = "yes"
+		}
 	}
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -4,6 +4,12 @@
 
 import aQute.bnd.osgi.Constants
 
+pluginManagement {
+	plugins {
+		id "com.gradle.enterprise" version "3.11.1"
+	}
+}
+
 /* Add bnd gradle plugin as a script dependency */
 buildscript {
 	repositories {
@@ -53,14 +59,16 @@ buildscript {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.11.1"
+	id "com.gradle.enterprise"
 }
 
-gradleEnterprise {
-	buildScan {
-		publishAlwaysIf(Boolean.parseBoolean(System.getenv("CI")))
-		termsOfServiceUrl = "https://gradle.com/terms-of-service"
-		termsOfServiceAgree = "yes"
+if (Boolean.parseBoolean(System.getenv("CI"))) {
+	gradleEnterprise {
+		buildScan {
+			publishAlways()
+			termsOfServiceUrl = "https://gradle.com/terms-of-service"
+			termsOfServiceAgree = "yes"
+		}
 	}
 }