diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 7e777d110b6..17de976e936 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -66,9 +66,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 81335228f2b..98d30308f44 100644 --- a/.github/workflows/benchmark-tags.yml +++ b/.github/workflows/benchmark-tags.yml @@ -54,8 +54,6 @@ jobs: with: arguments: | jmhJar - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 82bb73e5d17..c891310bd8b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,8 +24,6 @@ jobs: with: arguments: | jmhJar - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - name: Run Benchmark run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4fe1b2afba..f3a3a95e85c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,6 @@ jobs: -PtestJavaVersion=${{ matrix.test-java-version }} -Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_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 e8368cb4e4d..e041cecba53 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,6 @@ pluginManagement { plugins { id("com.github.johnrengelman.shadow") version "8.1.1" - id("com.gradle.develocity") version "3.17" id("de.undercouch.download") version "5.6.0" id("org.jsonschema2pojo") version "1.2.1" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" @@ -9,10 +8,6 @@ pluginManagement { } } -plugins { - id("com.gradle.develocity") -} - dependencyResolutionManagement { repositories { mavenCentral() @@ -63,41 +58,3 @@ 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("GRADLE_ENTERPRISE_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) } - } - } -}