Skip to content

Commit 7829f53

Browse files
authored
Update develocity configuration (#6903)
1 parent 8a3329b commit 7829f53

File tree

5 files changed

+5
-45
lines changed

5 files changed

+5
-45
lines changed

.github/repository-settings.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,5 @@ Same settings as above for `main`, except:
7171

7272
* `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
7373
* `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
74-
* `DEVELOCITY_ACCESS_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
75-
* Generated at https://ge.opentelemetry.io > My settings > Access keys
76-
* format of env var is `ge.opentelemetry.io=<access key>`,
77-
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
7874
* `SONATYPE_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
7975
* `SONATYPE_USER` - owned by [@jack-berg](https://github.com/jack-berg)

.github/workflows/benchmark-tags.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ jobs:
5454
uses: gradle/actions/setup-gradle@v4
5555
- name: Run jmh
5656
run: ./gradlew jmhJar
57-
env:
58-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5957

6058
- name: Run Benchmark
6159
run: |

.github/workflows/benchmark.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
uses: gradle/actions/setup-gradle@v4
2525
- name: Run jmh
2626
run: ./gradlew jmhJar
27-
env:
28-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2927

3028
- name: Run Benchmark
3129
run: |

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ jobs:
7575
"-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
7676
"-Porg.gradle.java.installations.auto-download=false"
7777
env:
78-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
7978
# JMH-based tests run only if this environment variable is set to true
8079
RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }}
8180

settings.gradle.kts

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -68,41 +68,10 @@ include(":sdk-extensions:jaeger-remote-sampler")
6868
include(":testing-internal")
6969
include(":animal-sniffer-signature")
7070

71-
val gradleEnterpriseServer = "https://ge.opentelemetry.io"
72-
val isCI = System.getenv("CI") != null
73-
val geAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: ""
74-
75-
// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
76-
val useScansGradleCom = isCI && geAccessKey.isEmpty()
77-
78-
if (useScansGradleCom) {
79-
develocity {
80-
buildScan {
81-
termsOfUseUrl.set("https://gradle.com/terms-of-service")
82-
termsOfUseAgree.set("yes")
83-
uploadInBackground.set(!isCI)
84-
publishing.onlyIf { true }
85-
86-
capture {
87-
fileFingerprints.set(true)
88-
}
89-
}
90-
}
91-
} else {
92-
develocity {
93-
server = gradleEnterpriseServer
94-
buildScan {
95-
uploadInBackground.set(!isCI)
96-
publishing.onlyIf {
97-
it.isAuthenticated
98-
}
99-
100-
capture {
101-
fileFingerprints.set(true)
102-
}
103-
104-
gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
105-
gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
106-
}
71+
develocity {
72+
buildScan {
73+
publishing.onlyIf { System.getenv("CI") != null }
74+
termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
75+
termsOfUseAgree.set("yes")
10776
}
10877
}

0 commit comments

Comments
 (0)