ci: Fix Spring Boot matrix version updates#5372
Draft
adinauer wants to merge 8 commits into
Draft
Conversation
📲 Install BuildsAndroid
|
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 319f256 | 322.02 ms | 380.33 ms | 58.30 ms |
| 889ecea | 367.58 ms | 437.52 ms | 69.94 ms |
| 2195398 | 309.39 ms | 354.53 ms | 45.14 ms |
| 72020f8 | 312.32 ms | 370.94 ms | 58.62 ms |
| 62b579c | 318.48 ms | 367.71 ms | 49.24 ms |
| 62b579c | 349.26 ms | 426.26 ms | 77.00 ms |
| dcc6bbf | 382.58 ms | 462.13 ms | 79.54 ms |
| 694d587 | 305.45 ms | 378.38 ms | 72.94 ms |
| 6b019b7 | 343.31 ms | 417.23 ms | 73.91 ms |
| d364ace | 411.72 ms | 430.81 ms | 19.10 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 319f256 | 1.58 MiB | 2.19 MiB | 619.79 KiB |
| 889ecea | 1.58 MiB | 2.11 MiB | 539.75 KiB |
| 2195398 | 0 B | 0 B | 0 B |
| 72020f8 | 1.58 MiB | 2.19 MiB | 620.21 KiB |
| 62b579c | 0 B | 0 B | 0 B |
| 62b579c | 0 B | 0 B | 0 B |
| dcc6bbf | 1.58 MiB | 2.12 MiB | 553.10 KiB |
| 694d587 | 1.58 MiB | 2.19 MiB | 620.06 KiB |
| 6b019b7 | 0 B | 0 B | 0 B |
| d364ace | 1.58 MiB | 2.11 MiB | 539.75 KiB |
Previous results on branch: ci/fix-spring-boot-matrix-version-sed
Startup times
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| e8826d8 | 331.94 ms | 394.48 ms | 62.54 ms |
| 741c273 | 287.21 ms | 372.79 ms | 85.58 ms |
| da499be | 312.21 ms | 351.30 ms | 39.09 ms |
| 4c74ba4 | 308.60 ms | 360.84 ms | 52.23 ms |
| 7092449 | 316.43 ms | 352.15 ms | 35.72 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| e8826d8 | 0 B | 0 B | 0 B |
| 741c273 | 0 B | 0 B | 0 B |
| da499be | 0 B | 0 B | 0 B |
| 4c74ba4 | 0 B | 0 B | 0 B |
| 7092449 | 0 B | 0 B | 0 B |
Match the TOML version catalog format when overriding Spring Boot versions in matrix jobs. Preserve whitespace around the assignment and replace the quoted version value so the CI jobs actually test the requested matrix version. Co-Authored-By: Claude <noreply@anthropic.com>
The matrix jobs now actually update the version catalog. Remove Spring Boot versions that the current sample setup cannot build with the repository's Spring GraphQL integrations and Gradle version. Co-Authored-By: Claude <noreply@anthropic.com>
Expand the Spring Boot 2 and 3 CI matrices to cover supported minor versions. Exclude GraphQL from Spring Boot 2 versions before 2.7 because the starter is unavailable there. Keep the Spring Boot 3 Gradle plugin pinned to a Gradle-compatible version while importing the tested Spring Boot BOM in samples, so the matrix exercises the intended runtime dependencies. Co-Authored-By: Claude <noreply@anthropic.com>
Remove the explicit elastic scheduler from the Spring Boot WebFlux sample. Mono.delay already schedules the delayed work, and using Schedulers.elastic triggers deprecation warnings that fail CI under -Werror. Co-Authored-By: Claude <noreply@anthropic.com>
Spring Kafka sample support depends on newer Spring Boot 2 dependency management. Exclude Kafka sources, profile startup, and system tests when the matrix runs Boot 2 versions before 2.7. Keep the system test classpath aligned with the SDK test helpers by importing the OkHttp and Jackson BOMs after the tested Spring Boot BOMs. Co-Authored-By: Claude <noreply@anthropic.com>
adinauer
force-pushed
the
ci/fix-spring-boot-matrix-version-sed
branch
from
1b25f8f to
87b8bc3
Compare
Spring Boot 2.1 and 2.2 use Reactor versions without Mono.doFirst or Schedulers.onScheduleHook. Avoid those calls in the Boot 2 WebFlux integration so old matrix jobs can start and serve requests. Co-Authored-By: Claude <noreply@anthropic.com>
Spring Boot 2.1 and 2.2 cannot parse newer OpenTelemetry auto-configuration classes during startup. Keep the matrix coverage for supported samples and skip the no-agent OTel sample for those versions. Co-Authored-By: Claude <noreply@anthropic.com>
Remove Spring Boot 2.1 and 2.2 from the matrix instead of carrying WebFlux compatibility changes for their older Reactor and Spring APIs. Restore the WebFlux filter implementation now that those versions are no longer tested. Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📜 Description
Fix the Spring Boot 2.x, 3.x, and 4.x matrix workflows so their version override matches the TOML version catalog format.
The workflows now preserve whitespace around the assignment and replace the quoted Spring Boot version value in
gradle/libs.versions.toml.💡 Motivation and Context
The existing
sedexpressions looked for keys without spaces around=, but the version catalog uses entries likespringboot2 = "2.7.18". As a result, matrix jobs did not actually update the Spring Boot version under test.💚 How did you test it?
sedexpressions against a temporary copy ofgradle/libs.versions.tomland verified Spring Boot 2, 3, and 4 versions were updated../gradlew spotlessApply apiDump.📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
#skip-changelog