Skip to content

chore: fix the iOS device tests and other leftovers from the version7 sync #5837

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
ric-oliv merged 3 commits into from
Oct 30, 2026
Merged

chore: fix the iOS device tests and other leftovers from the version7 sync #5837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65821da
test: pin Pkcs for the net11.0 EF Core integration tests
ric-oliv Oct 30, 2026
c2030e6
ci: run the device tests when Sentry.Extensions.Hosting changes
ric-oliv Oct 30, 2026
3b8e22a
ci: remove the Cocoa cache steps the version7 sync duplicated
ric-oliv Oct 30, 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
8 changes: 0 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,6 @@ jobs:
path: modules/sentry-cocoa/Carthage
key: ${{ steps.cache-cocoa.outputs.cache-primary-key }}

# Only a completed Cocoa build writes the stamp, so a failed one is never cached.
- name: Save Cocoa SDK
if: ${{ !cancelled() && steps.cache-cocoa.outputs.cache-primary-key != '' && steps.cache-cocoa.outputs.cache-hit != 'true' && hashFiles('modules/sentry-cocoa/Carthage/.built-from-sha') != '' }}
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: modules/sentry-cocoa/Carthage
key: ${{ steps.cache-cocoa.outputs.cache-primary-key }}

- name: Upload build logs
if: ${{ always() }}
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
Expand Down
2 changes: 2 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 @@ -28,6 +28,8 @@ on:
- 'test/Sentry.Testing/**'
- 'test/Sentry.Testing.CrashableApp/**'
- 'test/AndroidTestApp/**'
# Referenced by Sentry.Maui.Tests
- 'src/Sentry.Extensions.Hosting/**'
# Integration tests
- 'integration-test/android.Tests.ps1'
- 'integration-test/ios.Tests.ps1'
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/device-tests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ on:
- 'test/Sentry.Testing/**'
- 'test/Sentry.Testing.CrashableApp/**'
- 'test/AndroidTestApp/**'
# Referenced by Sentry.Maui.Tests
- 'src/Sentry.Extensions.Hosting/**'
# Integration tests
- 'integration-test/android.Tests.ps1'
- 'integration-test/ios.Tests.ps1'
Expand Down Expand Up @@ -89,18 +91,6 @@ jobs:
path: modules/sentry-cocoa/Carthage
key: ${{ steps.cocoa-key.outputs.key }}

# See build.yml
- name: Get Cocoa SDK cache key
id: cocoa-key
uses: ./.github/actions/cocoa-cache-key

- name: Restore Cocoa SDK
id: cache-cocoa
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: modules/sentry-cocoa/Carthage
key: ${{ steps.cocoa-key.outputs.key }}

- name: Build iOS Test App
run: pwsh ./scripts/device-test.ps1 ios -Build

Expand Down
5 changes: 4 additions & 1 deletion .../Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net48</TargetFrameworks>
</PropertyGroup>

<!-- Test EF Core 10 on .NET 10 -->
<!-- Test EF Core 11 on .NET 11 -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v11.0'">
<PackageReference Include="Verify.EntityFramework" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="11.0.0-rc.3.26522.148" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="11.0.0-rc.3.26522.148" />
<!-- https://github.com/advisories/GHSA-846f-f764-76mx -->
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="11.0.0-rc.3.26522.148" />
</ItemGroup>

<!-- Test EF Core 10 on .NET 10 -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And '$(TargetFrameworkVersion)' == 'v10.0'">
<PackageReference Include="Verify.EntityFramework" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
Expand Down
Loading