Skip to content

Update develocity configuration #1567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Update develocity configuration #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
"matchPackagePrefixes": ["io.micrometer:"],
"groupName": "micrometer packages"
},
{
"matchPackagePrefixes": ["com.gradle.enterprise"],
"groupName": "gradle enterprise packages"
},
{
// prevent 3.0.1u2 -> 3.0.1
"matchPackageNames": ["com.google.code.findbugs:annotations"],
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
cache-read-only: ${{ github.event_name == 'pull_request' }}
- name: Gradle build and test
run: ./gradlew build -x test
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

test:
name: test (${{ matrix.test-java-version }})
Expand Down Expand Up @@ -71,8 +69,6 @@ jobs:
-PtestJavaVersion=${{ matrix.test-java-version }}
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
-Porg.gradle.java.installations.auto-download=false
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

integration-test:
runs-on: ubuntu-latest
Expand All @@ -89,10 +85,9 @@ jobs:
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: ${{ github.event_name == 'pull_request' }}

- name: Integration test
run: ./gradlew integrationTest
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

- name: Save integration test results
uses: actions/upload-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2")
}

spotless {
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ tasks {
showCauses = true
showStackTraces = true
}

develocity.testRetry {
// You can see tests that were retried by this mechanism in the collected test reports and build scans.
if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
maxRetries.set(5)
}
}
Comment on lines -75 to -80
Copy link
Member Author

@trask trask Nov 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may be able to keep this, but we won't be able to see flaky tests across runs anymore, so maybe better to remove it (at least in this repo)

Copy link
Contributor

@laurit laurit Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think removing it is fine, if flaky tests are an issue we can work on them or reintroduce the retry.

}

withType<Javadoc>().configureEach {
Expand Down
43 changes: 6 additions & 37 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pluginManagement {
plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.gradle.develocity") version "3.18.2"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("com.gradle.develocity") version "3.18.2"
}
}

Expand All @@ -17,42 +17,11 @@ dependencyResolutionManagement {
}
}

val gradleEnterpriseServer = "https://ge.opentelemetry.io"
val isCI = System.getenv("CI") != null
val develocityAccessKey = 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 && develocityAccessKey.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")
}
}

Expand Down
Loading