Update develocity configuration (#6903)

This commit is contained in:
Trask Stalnaker 2024-11-25 08:34:18 -08:00 committed by GitHub
parent 8a3329be4d
commit 7829f53c24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 45 deletions

View File

@ -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=<access key>`,
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)

View File

@ -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: |

View File

@ -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: |

View File

@ -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 }}

View File

@ -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")
}
}