Skip to content

ci(spring): Remove unsupported Spring Boot versions from test matrix #6371

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

Open
sentry-junior wants to merge 2 commits into
base: 9.x.x
Choose a base branch
from
Open

ci(spring): Remove unsupported Spring Boot versions from test matrix #6371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8613f76
ci(spring): Remove unsupported Spring Boot versions from test matrix
sentry-junior[bot] Oct 23, 2026
76437ef
ci(spring): Drop redundant Spring Boot 2.7.0 from test matrix
sentry-junior[bot] Oct 23, 2026
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
6 changes: 1 addition & 5 deletions .github/workflows/spring-boot-2-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
springboot-version: [ '2.4.13', '2.5.15', '2.6.15', '2.7.0', '2.7.18' ]
springboot-version: [ '2.7.18' ]

name: Spring Boot ${{ matrix.springboot-version }}
env:
Expand Down Expand Up @@ -65,10 +65,6 @@ jobs:
- name: Update Spring Boot 2.x version
run: |
springboot_version="${{ matrix.springboot-version }}"
if [[ ! "$springboot_version" =~ ^2\.7\. ]]; then
echo "ORG_GRADLE_PROJECT_excludeGraphql=true" >> "$GITHUB_ENV"
echo "ORG_GRADLE_PROJECT_excludeKafka=true" >> "$GITHUB_ENV"
fi
perl -0pi -e 'BEGIN { $v = shift } s/^springboot2[[:space:]]*=[[:space:]]*"\K[^"]*/$v/m or die "::error::springboot2 version entry not found in gradle/libs.versions.toml\n"' "$springboot_version" gradle/libs.versions.toml
echo "Updated Spring Boot 2.x version to $springboot_version"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-3-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
springboot-version: [ '3.2.12', '3.3.13', '3.4.13', '3.5.13' ]
springboot-version: [ '3.4.13', '3.5.13' ]

name: Spring Boot ${{ matrix.springboot-version }}
env:
Expand Down
13 changes: 2 additions & 11 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,8 @@ group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"

fun springBoot2SupportsOptionalIntegrations(): Boolean {
val version = libs.versions.springboot2.get().removeSuffix(".RELEASE")
val parts = version.split(".").map { it.toIntOrNull() ?: 0 }
val major = parts.getOrElse(0) { 0 }
val minor = parts.getOrElse(1) { 0 }
return major > 2 || (major == 2 && minor >= 7)
}

val includeGraphql =
!project.hasProperty("excludeGraphql") && springBoot2SupportsOptionalIntegrations()
val includeKafka = !project.hasProperty("excludeKafka") && springBoot2SupportsOptionalIntegrations()
val includeGraphql = !project.hasProperty("excludeGraphql")
val includeKafka = !project.hasProperty("excludeKafka")

tasks.withType<KotlinCompile>().configureEach {
kotlin {
Expand Down
13 changes: 2 additions & 11 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,8 @@ group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"

fun springBoot2SupportsOptionalIntegrations(): Boolean {
val version = libs.versions.springboot2.get().removeSuffix(".RELEASE")
val parts = version.split(".").map { it.toIntOrNull() ?: 0 }
val major = parts.getOrElse(0) { 0 }
val minor = parts.getOrElse(1) { 0 }
return major > 2 || (major == 2 && minor >= 7)
}

val includeGraphql =
!project.hasProperty("excludeGraphql") && springBoot2SupportsOptionalIntegrations()
val includeKafka = !project.hasProperty("excludeKafka") && springBoot2SupportsOptionalIntegrations()
val includeGraphql = !project.hasProperty("excludeGraphql")
val includeKafka = !project.hasProperty("excludeKafka")

tasks.withType<KotlinCompile>().configureEach {
kotlin {
Expand Down
10 changes: 1 addition & 9 deletions sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,7 @@ group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"

fun springBoot2SupportsGraphql(): Boolean {
val version = libs.versions.springboot2.get().removeSuffix(".RELEASE")
val parts = version.split(".").map { it.toIntOrNull() ?: 0 }
val major = parts.getOrElse(0) { 0 }
val minor = parts.getOrElse(1) { 0 }
return major > 2 || (major == 2 && minor >= 7)
}

val includeGraphql = !project.hasProperty("excludeGraphql") && springBoot2SupportsGraphql()
val includeGraphql = !project.hasProperty("excludeGraphql")

dependencies {
implementation(platform(libs.springboot2.bom))
Expand Down
13 changes: 2 additions & 11 deletions sentry-samples/sentry-samples-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,8 @@ group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"

fun springBoot2SupportsOptionalIntegrations(): Boolean {
val version = libs.versions.springboot2.get().removeSuffix(".RELEASE")
val parts = version.split(".").map { it.toIntOrNull() ?: 0 }
val major = parts.getOrElse(0) { 0 }
val minor = parts.getOrElse(1) { 0 }
return major > 2 || (major == 2 && minor >= 7)
}

val includeGraphql =
!project.hasProperty("excludeGraphql") && springBoot2SupportsOptionalIntegrations()
val includeKafka = !project.hasProperty("excludeKafka") && springBoot2SupportsOptionalIntegrations()
val includeGraphql = !project.hasProperty("excludeGraphql")
val includeKafka = !project.hasProperty("excludeKafka")

tasks.withType<KotlinCompile>().configureEach {
kotlin {
Expand Down
Loading