Skip to content

Commit 65a4617

Browse files
runningcoderunningcode
authored
Merge 3e69be9 into a911f6d 
2 parents a911f6d + 3e69be9 commit 65a4617

3 files changed

Lines changed: 57 additions & 135 deletions

File tree

‎.github/workflows/spring-boot-2-matrix.yml‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -67,88 +67,62 @@ jobs:
6767
sed -i 's/^springboot2=.*/springboot2=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
6868
echo "Updated Spring Boot 2.x version to ${{ matrix.springboot-version }}"
6969
70-
- name: Exclude android modules from build
70+
- name: Build sample artifacts
7171
run: |
72-
sed -i \
73-
-e '/.*"sentry-android-ndk",/d' \
74-
-e '/.*"sentry-android",/d' \
75-
-e '/.*"sentry-compose",/d' \
76-
-e '/.*"sentry-android-core",/d' \
77-
-e '/.*"sentry-android-fragment",/d' \
78-
-e '/.*"sentry-android-navigation",/d' \
79-
-e '/.*"sentry-android-sqlite",/d' \
80-
-e '/.*"sentry-android-timber",/d' \
81-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
82-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
83-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
84-
-e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
85-
-e '/.*"sentry-android-integration-tests:test-app-size",/d' \
86-
-e '/.*"sentry-samples:sentry-samples-android",/d' \
87-
-e '/.*"sentry-android-replay",/d' \
88-
settings.gradle.kts
89-
90-
- name: Exclude android modules from ignore list
91-
run: |
92-
sed -i \
93-
-e '/.*"sentry-uitest-android",/d' \
94-
-e '/.*"sentry-uitest-android-benchmark",/d' \
95-
-e '/.*"sentry-uitest-android-critical",/d' \
96-
-e '/.*"test-app-sentry",/d' \
97-
-e '/.*"test-app-size",/d' \
98-
-e '/.*"sentry-samples-android",/d' \
99-
build.gradle.kts
100-
101-
- name: Build SDK
102-
run: |
103-
./gradlew assemble --parallel
72+
./gradlew \
73+
:sentry-samples:sentry-samples-spring-boot:shadowJar \
74+
:sentry-samples:sentry-samples-spring-boot:testClasses \
75+
:sentry-samples:sentry-samples-spring-boot-webflux:shadowJar \
76+
:sentry-samples:sentry-samples-spring-boot-webflux:testClasses \
77+
:sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
78+
:sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
79+
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:shadowJar \
80+
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:testClasses \
81+
:sentry-samples:sentry-samples-spring:war \
82+
:sentry-samples:sentry-samples-spring:testClasses \
83+
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
10484
10585
- name: Test sentry-samples-spring-boot
10686
run: |
10787
python3 test/system-test-runner.py test \
10888
--module "sentry-samples-spring-boot" \
10989
--agent false \
110-
--auto-init "true" \
111-
--build "true"
90+
--auto-init "true"
11291
11392
- name: Test sentry-samples-spring-boot-webflux
11493
run: |
11594
python3 test/system-test-runner.py test \
11695
--module "sentry-samples-spring-boot-webflux" \
11796
--agent false \
118-
--auto-init "true" \
119-
--build "true"
97+
--auto-init "true"
12098
12199
- name: Test sentry-samples-spring-boot-opentelemetry agent init true
122100
run: |
123101
python3 test/system-test-runner.py test \
124102
--module "sentry-samples-spring-boot-opentelemetry" \
125103
--agent true \
126-
--auto-init "true" \
127-
--build "true"
104+
--auto-init "true"
128105
129106
- name: Test sentry-samples-spring-boot-opentelemetry agent init false
130107
run: |
131108
python3 test/system-test-runner.py test \
132109
--module "sentry-samples-spring-boot-opentelemetry" \
133110
--agent true \
134-
--auto-init "false" \
135-
--build "true"
111+
--auto-init "false"
136112
137113
- name: Test sentry-samples-spring-boot-opentelemetry-noagent
138114
run: |
139115
python3 test/system-test-runner.py test \
140116
--module "sentry-samples-spring-boot-opentelemetry-noagent" \
141117
--agent false \
142-
--auto-init "true" \
143-
--build "true"
118+
--auto-init "true"
144119
145120
- name: Test sentry-samples-spring
146121
run: |
147122
python3 test/system-test-runner.py test \
148123
--module "sentry-samples-spring" \
149124
--agent false \
150-
--auto-init "true" \
151-
--build "true"
125+
--auto-init "true"
152126
153127
- name: Upload test results
154128
if: always()

‎.github/workflows/spring-boot-3-matrix.yml‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -67,88 +67,62 @@ jobs:
6767
sed -i 's/^springboot3=.*/springboot3=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
6868
echo "Updated Spring Boot 3.x version to ${{ matrix.springboot-version }}"
6969
70-
- name: Exclude android modules from build
70+
- name: Build sample artifacts
7171
run: |
72-
sed -i \
73-
-e '/.*"sentry-android-ndk",/d' \
74-
-e '/.*"sentry-android",/d' \
75-
-e '/.*"sentry-compose",/d' \
76-
-e '/.*"sentry-android-core",/d' \
77-
-e '/.*"sentry-android-fragment",/d' \
78-
-e '/.*"sentry-android-navigation",/d' \
79-
-e '/.*"sentry-android-sqlite",/d' \
80-
-e '/.*"sentry-android-timber",/d' \
81-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
82-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
83-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
84-
-e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
85-
-e '/.*"sentry-android-integration-tests:test-app-size",/d' \
86-
-e '/.*"sentry-samples:sentry-samples-android",/d' \
87-
-e '/.*"sentry-android-replay",/d' \
88-
settings.gradle.kts
89-
90-
- name: Exclude android modules from ignore list
91-
run: |
92-
sed -i \
93-
-e '/.*"sentry-uitest-android",/d' \
94-
-e '/.*"sentry-uitest-android-benchmark",/d' \
95-
-e '/.*"sentry-uitest-android-critical",/d' \
96-
-e '/.*"test-app-sentry",/d' \
97-
-e '/.*"test-app-size",/d' \
98-
-e '/.*"sentry-samples-android",/d' \
99-
build.gradle.kts
100-
101-
- name: Build SDK
102-
run: |
103-
./gradlew assemble --parallel
72+
./gradlew \
73+
:sentry-samples:sentry-samples-spring-boot-jakarta:bootJar \
74+
:sentry-samples:sentry-samples-spring-boot-jakarta:testClasses \
75+
:sentry-samples:sentry-samples-spring-boot-webflux-jakarta:bootJar \
76+
:sentry-samples:sentry-samples-spring-boot-webflux-jakarta:testClasses \
77+
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
78+
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:testClasses \
79+
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:bootJar \
80+
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:testClasses \
81+
:sentry-samples:sentry-samples-spring-jakarta:war \
82+
:sentry-samples:sentry-samples-spring-jakarta:testClasses \
83+
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
10484
10585
- name: Test sentry-samples-spring-boot-jakarta
10686
run: |
10787
python3 test/system-test-runner.py test \
10888
--module "sentry-samples-spring-boot-jakarta" \
10989
--agent false \
110-
--auto-init "true" \
111-
--build "true"
90+
--auto-init "true"
11291
11392
- name: Test sentry-samples-spring-boot-webflux-jakarta
11493
run: |
11594
python3 test/system-test-runner.py test \
11695
--module "sentry-samples-spring-boot-webflux-jakarta" \
11796
--agent false \
118-
--auto-init "true" \
119-
--build "true"
97+
--auto-init "true"
12098
12199
- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init true
122100
run: |
123101
python3 test/system-test-runner.py test \
124102
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
125103
--agent true \
126-
--auto-init "true" \
127-
--build "true"
104+
--auto-init "true"
128105
129106
- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init false
130107
run: |
131108
python3 test/system-test-runner.py test \
132109
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
133110
--agent true \
134-
--auto-init "false" \
135-
--build "true"
111+
--auto-init "false"
136112
137113
- name: Test sentry-samples-spring-boot-jakarta-opentelemetry-noagent
138114
run: |
139115
python3 test/system-test-runner.py test \
140116
--module "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" \
141117
--agent false \
142-
--auto-init "true" \
143-
--build "true"
118+
--auto-init "true"
144119
145120
- name: Test sentry-samples-spring-jakarta
146121
run: |
147122
python3 test/system-test-runner.py test \
148123
--module "sentry-samples-spring-jakarta" \
149124
--agent false \
150-
--auto-init "true" \
151-
--build "true"
125+
--auto-init "true"
152126
153127
- name: Upload test results
154128
if: always()

‎.github/workflows/spring-boot-4-matrix.yml‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -67,88 +67,62 @@ jobs:
6767
sed -i 's/^springboot4=.*/springboot4=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
6868
echo "Updated Spring Boot 4.x version to ${{ matrix.springboot-version }}"
6969
70-
- name: Exclude android modules from build
70+
- name: Build sample artifacts
7171
run: |
72-
sed -i \
73-
-e '/.*"sentry-android-ndk",/d' \
74-
-e '/.*"sentry-android",/d' \
75-
-e '/.*"sentry-compose",/d' \
76-
-e '/.*"sentry-android-core",/d' \
77-
-e '/.*"sentry-android-fragment",/d' \
78-
-e '/.*"sentry-android-navigation",/d' \
79-
-e '/.*"sentry-android-sqlite",/d' \
80-
-e '/.*"sentry-android-timber",/d' \
81-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
82-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
83-
-e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
84-
-e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
85-
-e '/.*"sentry-android-integration-tests:test-app-size",/d' \
86-
-e '/.*"sentry-samples:sentry-samples-android",/d' \
87-
-e '/.*"sentry-android-replay",/d' \
88-
settings.gradle.kts
89-
90-
- name: Exclude android modules from ignore list
91-
run: |
92-
sed -i \
93-
-e '/.*"sentry-uitest-android",/d' \
94-
-e '/.*"sentry-uitest-android-benchmark",/d' \
95-
-e '/.*"sentry-uitest-android-critical",/d' \
96-
-e '/.*"test-app-sentry",/d' \
97-
-e '/.*"test-app-size",/d' \
98-
-e '/.*"sentry-samples-android",/d' \
99-
build.gradle.kts
100-
101-
- name: Build SDK
102-
run: |
103-
./gradlew assemble --parallel
72+
./gradlew \
73+
:sentry-samples:sentry-samples-spring-boot-4:bootJar \
74+
:sentry-samples:sentry-samples-spring-boot-4:testClasses \
75+
:sentry-samples:sentry-samples-spring-boot-4-webflux:bootJar \
76+
:sentry-samples:sentry-samples-spring-boot-4-webflux:testClasses \
77+
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
78+
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry:testClasses \
79+
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:bootJar \
80+
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:testClasses \
81+
:sentry-samples:sentry-samples-spring-7:war \
82+
:sentry-samples:sentry-samples-spring-7:testClasses \
83+
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
10484
10585
- name: Run sentry-samples-spring-boot-4
10686
run: |
10787
python3 test/system-test-runner.py test \
10888
--module "sentry-samples-spring-boot-4" \
10989
--agent false \
110-
--auto-init "true" \
111-
--build "true"
90+
--auto-init "true"
11291
11392
- name: Run sentry-samples-spring-boot-4-webflux
11493
run: |
11594
python3 test/system-test-runner.py test \
11695
--module "sentry-samples-spring-boot-4-webflux" \
11796
--agent false \
118-
--auto-init "true" \
119-
--build "true"
97+
--auto-init "true"
12098
12199
- name: Run sentry-samples-spring-boot-4-opentelemetry agent init true
122100
run: |
123101
python3 test/system-test-runner.py test \
124102
--module "sentry-samples-spring-boot-4-opentelemetry" \
125103
--agent true \
126-
--auto-init "true" \
127-
--build "true"
104+
--auto-init "true"
128105
129106
- name: Run sentry-samples-spring-boot-4-opentelemetry agent init false
130107
run: |
131108
python3 test/system-test-runner.py test \
132109
--module "sentry-samples-spring-boot-4-opentelemetry" \
133110
--agent true \
134-
--auto-init "false" \
135-
--build "true"
111+
--auto-init "false"
136112
137113
- name: Run sentry-samples-spring-boot-4-opentelemetry-noagent
138114
run: |
139115
python3 test/system-test-runner.py test \
140116
--module "sentry-samples-spring-boot-4-opentelemetry-noagent" \
141117
--agent false \
142-
--auto-init "true" \
143-
--build "true"
118+
--auto-init "true"
144119
145120
- name: Run sentry-samples-spring-7
146121
run: |
147122
python3 test/system-test-runner.py test \
148123
--module "sentry-samples-spring-7" \
149124
--agent false \
150-
--auto-init "true" \
151-
--build "true"
125+
--auto-init "true"
152126
153127
- name: Upload test results
154128
if: always()

0 commit comments

Comments
 (0)