Skip to content

ci: skip the device test app in the macOS build and stop serializing verify-api and format-code #5758

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
jamescrosswell merged 2 commits into from
Oct 22, 2026
Merged

ci: skip the device test app in the macOS build and stop serializing verify-api and format-code #5758

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
e8730ff
ci: stop building the device test app in the macOS build job
ric-oliv Oct 21, 2026
aa12ec7
ci: serialize only the jobs that push in verify-api and format-code
ric-oliv Oct 21, 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
5 changes: 5 additions & 0 deletions .github/workflows/device-tests-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'src/Sentry/**'
- 'src/Sentry.Extensions.Logging/**'
- 'src/Sentry.Compiler.Extensions/**'
- 'src/Sentry.Analyzers/**'
# Mobile-specific packages
- 'src/Sentry.Maui/**'
- 'src/Sentry.Maui.CommunityToolkit.Mvvm/**'
Expand All @@ -25,6 +26,7 @@ on:
- 'test/Sentry.Maui.CommunityToolkit.Mvvm.Tests/**'
- 'test/Sentry.Android.AssemblyReader.Tests/**'
- 'test/Sentry.Testing/**'
- 'test/Sentry.Testing.CrashableApp/**'
- 'test/AndroidTestApp/**'
# Integration tests
- 'integration-test/android.Tests.ps1'
Expand All @@ -41,6 +43,9 @@ on:
- 'global.json'
- 'Directory.Build.props'
- 'Directory.Build.targets'
- 'src/Directory.Build.*'
- 'test/Directory.Build.*'
- '.editorconfig'
- 'nuget.config'
# Scripts and CI
- 'scripts/device-test.ps1'
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/device-tests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'src/Sentry/**'
- 'src/Sentry.Extensions.Logging/**'
- 'src/Sentry.Compiler.Extensions/**'
- 'src/Sentry.Analyzers/**'
# Mobile-specific packages
- 'src/Sentry.Maui/**'
- 'src/Sentry.Maui.CommunityToolkit.Mvvm/**'
Expand All @@ -25,6 +26,7 @@ on:
- 'test/Sentry.Maui.CommunityToolkit.Mvvm.Tests/**'
- 'test/Sentry.Android.AssemblyReader.Tests/**'
- 'test/Sentry.Testing/**'
- 'test/Sentry.Testing.CrashableApp/**'
- 'test/AndroidTestApp/**'
# Integration tests
- 'integration-test/android.Tests.ps1'
Expand All @@ -41,6 +43,9 @@ on:
- 'global.json'
- 'Directory.Build.props'
- 'Directory.Build.targets'
- 'src/Directory.Build.*'
- 'test/Directory.Build.*'
- '.editorconfig'
- 'nuget.config'
# Scripts and CI
- 'scripts/device-test.ps1'
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/format-code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ on:
- 'samples/**'
- '.github/workflows/format-code.yml'

# Serialize with verify-api.yml so the two auto-commit workflows can't race
# each other's git push on the same PR branch.
concurrency:
group: pr-auto-commit-${{ github.event.pull_request.number }}
cancel-in-progress: false

jobs:
format-code:
name: Format Code
# Serialize with the commit job in verify-api.yml so the two auto-commit jobs can't race each
# other's git push on the same PR branch.
concurrency:
group: pr-auto-commit-${{ github.event.pull_request.number }}
cancel-in-progress: false
# Run on 'macos' because Linux is missing the `ios` workload: https://github.com/dotnet/runtime/issues/85505
# Pin macos to get the version of XCode that we need: https://github.com/actions/runner-images/issues/10703
runs-on: xcode-27
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/verify-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ on:
- 'test/Sentry.Testing/ApiExtensions.cs'
- '.github/workflows/verify-api.yml'

# Serialize with format-code.yml so the two auto-commit workflows can't race
# each other's git push on the same PR branch.
concurrency:
group: pr-auto-commit-${{ github.event.pull_request.number }}
cancel-in-progress: false

jobs:
run-api-tests:
name: Run API Approval Tests (${{ matrix.rid }})
Expand Down Expand Up @@ -120,6 +114,11 @@ jobs:
needs: run-api-tests
runs-on: ubuntu-24.04
if: github.event.pull_request.head.repo.full_name == github.repository
# Serialize with format-code.yml so the two auto-commit jobs can't race each other's git push
# on the same PR branch. Only the pushing job is in the group, so the API tests don't wait.
concurrency:
group: pr-auto-commit-${{ github.event.pull_request.number }}
cancel-in-progress: false
permissions:
contents: write
pull-requests: write
Expand Down
1 change: 0 additions & 1 deletion Sentry-CI-Build-macOS.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"test\\Sentry.Log4Net.Tests\\Sentry.Log4Net.Tests.csproj",
"test\\Sentry.Log4Net.V3.Tests\\Sentry.Log4Net.V3.Tests.csproj",
"test\\Sentry.Maui.CommunityToolkit.Mvvm.Tests\\Sentry.Maui.CommunityToolkit.Mvvm.Tests.csproj",
"test\\Sentry.Maui.Device.TestApp\\Sentry.Maui.Device.TestApp.csproj",
"test\\Sentry.Maui.Tests\\Sentry.Maui.Tests.csproj",
"test\\Sentry.NLog.Tests\\Sentry.NLog.Tests.csproj",
"test\\Sentry.OpenTelemetry.Exporter.Tests\\Sentry.OpenTelemetry.Exporter.Tests.csproj",
Expand Down
1 change: 1 addition & 0 deletions scripts/generate-solution-filters-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ filterConfigs:
patterns:
- "**/*AndroidTestApp.csproj"
- "**/*DeviceTests*.csproj"
- "**/*Sentry.Maui.Device.TestApp.csproj"
- "**/*.AspNet.Tests.csproj"

- outputPath: Sentry-CI-Build-Windows.slnf
Expand Down
Loading