Update gradle enterprise server (#4691)

Co-authored-by: Nicola Corti <corti.nico@gmail.com>
detekt · Apr 8, 2022 · 2f5e18e · 2f5e18e
1 parent 966cc50
commit 2f5e18e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/detekt-with-type-resolution.yaml b/.github/workflows/detekt-with-type-resolution.yaml
@@ -8,6 +8,9 @@ on:
     branches:
       - '**'
 
+env:
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+
 jobs:
   plain:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
@@ -8,6 +8,9 @@ on:
     branches:
       - '**'
 
+env:
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+
 jobs:
   gradle:
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,5 @@
+import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
+
 rootProject.name = "detekt"
 
 pluginManagement {
@@ -40,16 +42,26 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 // build scan plugin can only be applied in settings file
 plugins {
     `gradle-enterprise`
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
 }
 
 gradleEnterprise {
     val isCiBuild = System.getenv("CI") != null
 
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        if (isCiBuild) {
-            termsOfServiceAgree = "yes"
-            publishAlways()
+        publishAlways()
+
+        // Publish to scans.gradle.com when `--scan` is used explicitly
+        if (!gradle.startParameter.isBuildScan) {
+            server = "https://ge.detekt.dev"
+            this as BuildScanExtensionWithHiddenFeatures
+            publishIfAuthenticated()
+        }
+
+        isUploadInBackground = !isCiBuild
+
+        capture {
+            isTaskInputFiles = true
         }
     }
 }