From 5c121ad381e469d49107f3bc5aa316a0b80dc28f Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Thu, 29 Sep 2022 10:23:49 -0400 Subject: [PATCH] ci: Only accept gradle build scan TOS on CI builds Signed-off-by: BJ Hargrave --- gradle-plugins/settings.gradle.kts | 19 +++++++++++++++++-- settings.gradle | 20 ++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/gradle-plugins/settings.gradle.kts b/gradle-plugins/settings.gradle.kts index c0b45b70ec..ab29f97ae0 100644 --- 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 index 369c21a971..0d1ccb1ae8 100644 --- 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" + } } }