Skip to content

Commit c2007f8

Browse files
committed
Update develocity configuration
1 parent 114dacb commit c2007f8

File tree

2 files changed

+7
-28
lines changed

2 files changed

+7
-28
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ jobs:
4040
uses: gradle/actions/setup-gradle@v4
4141
with:
4242
cache-read-only: ${{ github.event_name == 'pull_request' }}
43+
4344
- name: Build
44-
run: ./gradlew clean check shadowJar
45-
env:
46-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
45+
run: ./gradlew clean check shadowJar --scan
4746

4847
- run: java -cp sdk-usage/build/libs/opentelemetry-examples-sdk-usage-0.1.0-SNAPSHOT-all.jar io.opentelemetry.sdk.example.ConfigureSpanProcessorExample
4948

settings.gradle.kts

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,22 @@ pluginManagement {
33
id("com.diffplug.spotless") version "6.25.0"
44
id("com.github.johnrengelman.shadow") version "8.1.1"
55
id("com.google.protobuf") version "0.9.4"
6-
id("com.gradle.develocity") version "3.18.2"
76
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
87
id("com.google.cloud.tools.jib") version "3.4.4"
8+
id("com.gradle.develocity") version "3.18.2"
99
}
1010
}
1111

1212
plugins {
13-
id("com.gradle.develocity")
1413
id("org.gradle.toolchains.foojay-resolver-convention")
14+
id("com.gradle.develocity")
1515
}
1616

17-
val gradleEnterpriseServer = "https://ge.opentelemetry.io"
18-
val isCI = System.getenv("CI") != null
19-
val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
20-
21-
// if the GE access key is not given, and we are in CI, then we publish to scans.gradle.com
22-
val useScansGradleCom = isCI && geAccessKey.isEmpty()
23-
2417
develocity {
25-
if (!useScansGradleCom) {
26-
server = gradleEnterpriseServer
27-
}
2818
buildScan {
29-
uploadInBackground = !isCI
30-
31-
if (useScansGradleCom) {
32-
termsOfUseUrl = "https://gradle.com/terms-of-service"
33-
termsOfUseAgree = "yes"
34-
publishing.onlyIf {true }
35-
} else {
36-
publishing.onlyIf { geAccessKey.isNotEmpty() }
37-
}
38-
39-
capture {
40-
fileFingerprints.set(true)
41-
}
19+
publishing.onlyIf { System.getenv("CI") != null }
20+
termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
21+
termsOfUseAgree.set("yes")
4222
}
4323
}
4424

0 commit comments

Comments
 (0)