diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 874eebfab7..79d583584b 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -71,9 +71,5 @@ Same settings as above for `main`, except: * `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password * `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password -* `DEVELOCITY_ACCESS_KEY` - owned by [@jack-berg](https://github.com/jack-berg) - * Generated at https://ge.opentelemetry.io > My settings > Access keys - * format of env var is `ge.opentelemetry.io=`, - see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable) * `SONATYPE_KEY` - owned by [@jack-berg](https://github.com/jack-berg) * `SONATYPE_USER` - owned by [@jack-berg](https://github.com/jack-berg) diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml index 955a4bdcd0..5831c0f981 100644 --- a/.github/workflows/benchmark-tags.yml +++ b/.github/workflows/benchmark-tags.yml @@ -54,8 +54,6 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Run jmh run: ./gradlew jmhJar - env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index bb47139b03..1f026b2c65 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,8 +24,6 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Run jmh run: ./gradlew jmhJar - env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c600b3539e..7244872f30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,6 @@ jobs: "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" "-Porg.gradle.java.installations.auto-download=false" env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # JMH-based tests run only if this environment variable is set to true RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }} diff --git a/settings.gradle.kts b/settings.gradle.kts index 199db38a1f..76df07b560 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -68,41 +68,10 @@ include(":sdk-extensions:jaeger-remote-sampler") include(":testing-internal") include(":animal-sniffer-signature") -val gradleEnterpriseServer = "https://ge.opentelemetry.io" -val isCI = System.getenv("CI") != null -val geAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: "" - -// if GE access key is not given and we are in CI, then we publish to scans.gradle.com -val useScansGradleCom = isCI && geAccessKey.isEmpty() - -if (useScansGradleCom) { - develocity { - buildScan { - termsOfUseUrl.set("https://gradle.com/terms-of-service") - termsOfUseAgree.set("yes") - uploadInBackground.set(!isCI) - publishing.onlyIf { true } - - capture { - fileFingerprints.set(true) - } - } - } -} else { - develocity { - server = gradleEnterpriseServer - buildScan { - uploadInBackground.set(!isCI) - publishing.onlyIf { - it.isAuthenticated - } - - capture { - fileFingerprints.set(true) - } - - gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) } - gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) } - } +develocity { + buildScan { + publishing.onlyIf { System.getenv("CI") != null } + termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use") + termsOfUseAgree.set("yes") } }