Skip to content

Commit e58d7bf

Browse files
authored
chore: Use Cirrus Runners for running unit tests on iOS 26 (#6812)
* chore: Use Cirrus Runners for running unit tests on iOS 26 * Fix broken attribute * Remove " * Keep timeout parameter * Use runs-on * Typo... * Add `run_on_cirrus_labs` to common workflow * Flip condition * Use tahoe * Just use contains value * Update target version
1 parent 25d9b58 commit e58d7bf

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,17 @@ jobs:
235235
secrets: inherit
236236
with:
237237
name: ${{matrix.name}}
238-
runs-on: ${{matrix.runs-on}}
238+
runs-on: ${{ matrix.runs-on }}
239239
should_skip: ${{needs.files-changed.outputs.run_unit_tests_for_prs != 'true'}}
240240
xcode: ${{matrix.xcode}}
241241
platform: ${{matrix.platform}}
242242
test-destination-os: ${{matrix.test-destination-os || 'latest'}}
243-
timeout: ${{matrix.timeout || 20}}
243+
timeout: 20
244244
create_device: ${{matrix.create_device || false}}
245245
install_platforms: ${{matrix.install_platforms || false}}
246246
device: ${{matrix.device || ''}}
247247
scheme: ${{matrix.scheme || 'Sentry'}}
248+
run_on_cirrus_labs: ${{ !contains(matrix.runs-on, 'macos-') }}
248249
strategy:
249250
fail-fast: false
250251
matrix:
@@ -273,14 +274,12 @@ jobs:
273274

274275
# iOS 26 - Use pre-installed iOS 26.1 runtime on macOS-26
275276
- name: iOS 26 Sentry
276-
runs-on: macos-26
277-
xcode: "26.1"
277+
runs-on: tahoe
278+
xcode: "26.1.1"
278279
test-destination-os: "26.1"
279280
platform: "iOS"
280281
device: "iPhone 17 Pro"
281282
scheme: "Sentry"
282-
# This runner seems to be slower than the others, so we give it more time because otherwise it frequently times out. The build step often alone takes 20 minutes and also booting the simulator takes a while.
283-
timeout: 40
284283

285284
# We don't run the unit tests on macOS 13 cause we run them on all on GH actions available iOS versions.
286285
# The chance of missing a bug solely on tvOS 16 that doesn't occur on iOS, macOS 12 or macOS 14 is minimal.

.github/workflows/unit-test-common.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ on:
6363
required: true
6464
type: string
6565

66+
run_on_cirrus_labs:
67+
description: "Whether to run the tests on Cirrus Labs"
68+
required: false
69+
default: false
70+
type: boolean
71+
6672
jobs:
6773
unit-tests:
6874
name: Unit ${{inputs.name}}
69-
runs-on: ${{inputs.runs-on}}
75+
runs-on: ${{ inputs.run_on_cirrus_labs && fromJSON(format('["ghcr.io/cirruslabs/macos-runner:{0}", "runner_group_id:10"]', inputs.runs-on)) || inputs.runs-on }}
7076
timeout-minutes: ${{inputs.timeout}}
7177
if: ${{!inputs.should_skip}}
7278
steps:

0 commit comments

Comments
 (0)