Add build scans to PR builds

elliedori · web-flow · commit 7ef3f6192428 · 2020-09-30T10:20:12.000-04:00
diff --git a/.github/workflows/pr-build-workflow.yml b/.github/workflows/pr-build-workflow.yml
@@ -19,4 +19,4 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
       - name: Build with Gradle
-        run: ./gradlew clean build --continue
+        run: ./gradlew clean build --continue --scan
diff --git a/build.gradle b/build.gradle
@@ -66,6 +66,13 @@ allprojects {
 	}
 }
 
+if (hasProperty('buildScan')) {
+	buildScan {
+		termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+		termsOfServiceAgree = 'yes'
+	}
+}
+
 nohttp {
 	allowlistFile = project.file("etc/nohttp/allowlist.lines")
 }
diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
 
 plugins {
 	id "com.gradle.enterprise" version "3.2"
-	id "io.spring.gradle-enterprise-conventions" version "0.0.2"
+	id "io.spring.ge.conventions" version "0.0.6"
 }
 
 rootProject.name = 'spring-security'

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,13 @@ allprojects {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
	`69`	`+if (hasProperty('buildScan')) {`
	`70`	`+ buildScan {`
	`71`	`+ termsOfServiceUrl = 'https://gradle.com/terms-of-service'`
	`72`	`+ termsOfServiceAgree = 'yes'`
	`73`	`+ }`
	`74`	`+}`
	`75`	`+`
`69`	`76`	`nohttp {`
`70`	`77`	`allowlistFile = project.file("etc/nohttp/allowlist.lines")`
`71`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pluginManagement {`
`7`	`7`
`8`	`8`	`plugins {`
`9`	`9`	`id "com.gradle.enterprise" version "3.2"`
`10`		`- id "io.spring.gradle-enterprise-conventions" version "0.0.2"`
	`10`	`+ id "io.spring.ge.conventions" version "0.0.6"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`rootProject.name = 'spring-security'`