Skip to content

ci: run iOS device tests on arm64 #4961

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

Draft
jpnurmi wants to merge 5 commits into
base: main
Choose a base branch
from
+9 −11
Draft

ci: run iOS device tests on arm64 #4961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
502b6a2
ci: run iOS device tests on arm64
jpnurmi Feb 27, 2026
2fb862a
ci: pre-disable simulator watchdogs before boot
jpnurmi Feb 27, 2026
d10ed15
debug: enable verbose output for iOS device tests
jpnurmi Feb 27, 2026
dbff261
Revert "ci: pre-disable simulator watchdogs before boot"
jpnurmi Feb 28, 2026
a55c177
Try xharness 11.0.0-prerelease.26117.1
jpnurmi Feb 28, 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
4 changes: 2 additions & 2 deletions .github/workflows/device-tests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ jobs:
id: first-test-run
continue-on-error: true
timeout-minutes: 40
run: pwsh scripts/device-test.ps1 ios -Run
run: pwsh scripts/device-test.ps1 ios -Run -Verbose

- name: Retry Tests (if previous failed to run)
if: steps.first-test-run.outcome == 'failure'
timeout-minutes: 40
run: pwsh scripts/device-test.ps1 ios -Run
run: pwsh scripts/device-test.ps1 ios -Run -Verbose

- name: Run Integration Tests
id: first-integration-test-run
Expand Down
2 changes: 1 addition & 1 deletion scripts/device-test-utils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function Install-XHarness
{
$CI = Test-Path env:CI
Push-Location ($CI ? $env:RUNNER_TEMP : $IsWindows ? $env:TMP : $IsMacos ? $env:TMPDIR : '/tmp')
dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version '10.0.0-prerelease.25466.1' `
dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version '11.0.0-prerelease.26117.1' `
--add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json
Pop-Location
}
Expand Down
2 changes: 0 additions & 2 deletions scripts/device-test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ try
{
$Tfm += '-ios'
$group = 'apple'
# Always use x64 on iOS, since arm64 doesn't support JIT, which is required for tests using NSubstitute
$arch = 'x64'
$buildDir = "test/Sentry.Maui.Device.TestApp/bin/Release/$Tfm/iossimulator-$arch"
$envValue = $CI ? 'true' : 'false'
$arguments = @(
Expand Down
8 changes: 4 additions & 4 deletions test/Sentry.Extensions.Logging.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ public class SentryHttpMessageHandlerBuilderFilterTests
[SkippableFact]
public void Configure_HandlerEnabled_ShouldAddSentryHttpMessageHandler()
{
#if __ANDROID__
Skip.If(true, "Can't create proxies for classes without parameterless constructors on Android");
#if __MOBILE__
Skip.If(true, "Can't create proxies for classes without parameterless constructors on mobile");
#endif

// Arrange
Expand All @@ -31,8 +31,8 @@ public void Configure_HandlerEnabled_ShouldAddSentryHttpMessageHandler()
[SkippableFact]
public void Configure_HandlerDisabled_ShouldNotAddSentryHttpMessageHandler()
{
#if __ANDROID__
Skip.If(true, "Can't create proxies for classes without parameterless constructors on Android");
#if __MOBILE__
Skip.If(true, "Can't create proxies for classes without parameterless constructors on mobile");
#endif

// Arrange
Expand Down
4 changes: 2 additions & 2 deletions test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'android' And '$(OSArchitecture)' == 'Arm64'">android-arm64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'android' And '$(OSArchitecture)' == 'x64'">android-x64</RuntimeIdentifier>

<!-- On iOS we always target x64 since Arm64 doesn't support JIT, which is required by tests using NSubstitute -->
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios' And '$(OSArchitecture)' == 'Arm64'">iossimulator-arm64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'ios' And '$(OSArchitecture)' == 'x64'">iossimulator-x64</RuntimeIdentifier>

<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' And '$(OSArchitecture)' == 'Arm64'">maccatalyst-arm64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' And '$(OSArchitecture)' == 'x64'">maccatalyst-x64</RuntimeIdentifier>
Expand Down
Loading