Skip to content

Commit 2fab853

Browse files
Update develocity configuration (#97)
Co-authored-by: OpenTelemetry Bot <[email protected]>
1 parent d3aa5f6 commit 2fab853

File tree

2 files changed

+10
-44
lines changed

2 files changed

+10
-44
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ jobs:
6262
build
6363
-PtestJavaVersion=${{ matrix.test-java-version }}
6464
-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
65-
env:
66-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6765
6866
- name: generate
6967
# Skip running on macos-latest which doesn't have docker

settings.gradle.kts

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
pluginManagement {
22
plugins {
3-
id("com.gradle.enterprise") version "3.14.1"
43
id("de.undercouch.download") version "5.4.0"
54
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
5+
id("com.gradle.develocity") version "3.18.2"
66
}
77
}
88

99
plugins {
10-
id("com.gradle.enterprise")
10+
id("com.gradle.develocity")
1111
}
1212

1313
dependencyResolutionManagement {
@@ -17,47 +17,15 @@ dependencyResolutionManagement {
1717
}
1818
}
1919

20+
develocity {
21+
buildScan {
22+
publishing.onlyIf { System.getenv("CI") != null }
23+
termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
24+
termsOfUseAgree.set("yes")
25+
}
26+
}
27+
2028
rootProject.name = "semantic-conventions-java"
2129
include(":dependencyManagement")
2230
include(":semconv-incubating")
2331
include(":semconv")
24-
25-
val gradleEnterpriseServer = "https://ge.opentelemetry.io"
26-
val isCI = System.getenv("CI") != null
27-
val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
28-
29-
// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
30-
val useScansGradleCom = isCI && geAccessKey.isEmpty()
31-
32-
if (useScansGradleCom) {
33-
gradleEnterprise {
34-
buildScan {
35-
termsOfServiceUrl = "https://gradle.com/terms-of-service"
36-
termsOfServiceAgree = "yes"
37-
isUploadInBackground = !isCI
38-
publishAlways()
39-
40-
capture {
41-
isTaskInputFiles = true
42-
}
43-
}
44-
}
45-
} else {
46-
gradleEnterprise {
47-
server = gradleEnterpriseServer
48-
buildScan {
49-
isUploadInBackground = !isCI
50-
51-
this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
52-
publishIfAuthenticated()
53-
publishAlways()
54-
55-
capture {
56-
isTaskInputFiles = true
57-
}
58-
59-
gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
60-
gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
61-
}
62-
}
63-
}

0 commit comments

Comments
 (0)