From 1ccfc5cea1bada06bcf963f6f84b269b5708f695 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam.brown@sentry.io>
Date: Wed, 20 May 2026 21:02:48 +0200
Subject: [PATCH 1/2] chore(ci): Skip Spring Boot matrix jobs on Android-only
 pull requests (JAVA-510)

Prior to this commit, Android-only PRs were silently triggering 14 unrelated Spring Boot matrix jobs (up to 45 min each). The pull_request trigger had no path filter at all, and the push filter only matched one of the ~10 Android modules.

This commit fixes both issues by adding the missing PR filter and broadening the pattern to cover all Android directories, so Spring Boot CI skips entirely when nothing Spring-related changed.
---
 .github/workflows/spring-boot-2-matrix.yml | 8 +++++++-
 .github/workflows/spring-boot-3-matrix.yml | 8 +++++++-
 .github/workflows/spring-boot-4-matrix.yml | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/spring-boot-2-matrix.yml b/.github/workflows/spring-boot-2-matrix.yml
index 38aaacec27a..414a9562434 100644
--- a/.github/workflows/spring-boot-2-matrix.yml
+++ b/.github/workflows/spring-boot-2-matrix.yml
@@ -5,8 +5,14 @@ on:
     branches:
       - main
     paths-ignore:
-      - '**/sentry-android/**'
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
+    paths-ignore:
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/spring-boot-3-matrix.yml b/.github/workflows/spring-boot-3-matrix.yml
index 629535e282d..471bf1990d8 100644
--- a/.github/workflows/spring-boot-3-matrix.yml
+++ b/.github/workflows/spring-boot-3-matrix.yml
@@ -5,8 +5,14 @@ on:
     branches:
       - main
     paths-ignore:
-      - '**/sentry-android/**'
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
+    paths-ignore:
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml
index bbd4f986d96..d1d6f44becd 100644
--- a/.github/workflows/spring-boot-4-matrix.yml
+++ b/.github/workflows/spring-boot-4-matrix.yml
@@ -5,8 +5,14 @@ on:
     branches:
       - main
     paths-ignore:
-      - '**/sentry-android/**'
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
+    paths-ignore:
+      - '*android*/**'
+      - 'sentry-compose/**'
+      - 'sentry-samples/sentry-samples-android/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From 20b57955c2477c1aaf38f00177d5c3bf8da8846d Mon Sep 17 00:00:00 2001
From: Adam Brown <adam.brown@sentry.io>
Date: Thu, 21 May 2026 10:58:29 +0200
Subject: [PATCH 2/2] chore(ci): Always run Spring Boot matrix on main pushes
 (JAVA-510)

Keep path filters on pull_request only so Android-only PRs skip the matrix,
but every merge to main still runs the full Spring Boot 2/3/4 workflows.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/workflows/spring-boot-2-matrix.yml | 4 ----
 .github/workflows/spring-boot-3-matrix.yml | 4 ----
 .github/workflows/spring-boot-4-matrix.yml | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/.github/workflows/spring-boot-2-matrix.yml b/.github/workflows/spring-boot-2-matrix.yml
index 414a9562434..9a69765657c 100644
--- a/.github/workflows/spring-boot-2-matrix.yml
+++ b/.github/workflows/spring-boot-2-matrix.yml
@@ -4,10 +4,6 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - '*android*/**'
-      - 'sentry-compose/**'
-      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
     paths-ignore:
       - '*android*/**'
diff --git a/.github/workflows/spring-boot-3-matrix.yml b/.github/workflows/spring-boot-3-matrix.yml
index 471bf1990d8..c6a83c597fb 100644
--- a/.github/workflows/spring-boot-3-matrix.yml
+++ b/.github/workflows/spring-boot-3-matrix.yml
@@ -4,10 +4,6 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - '*android*/**'
-      - 'sentry-compose/**'
-      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
     paths-ignore:
       - '*android*/**'
diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml
index d1d6f44becd..93d314de2e3 100644
--- a/.github/workflows/spring-boot-4-matrix.yml
+++ b/.github/workflows/spring-boot-4-matrix.yml
@@ -4,10 +4,6 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - '*android*/**'
-      - 'sentry-compose/**'
-      - 'sentry-samples/sentry-samples-android/**'
   pull_request:
     paths-ignore:
       - '*android*/**'