Skip to content

Commit ba07020

Browse files
authored
Merge pull request #422 from brandonpage/macos-26-github-actions
iOS 26 CI
2 parents 15497ba + 8ae0856 commit ba07020

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

.github/workflows/nightly.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14+
ios: [^26, ^18, ^17]
1415
include:
15-
- macos: macos-15
16-
ios: ^18
16+
- ios: ^26
17+
xcode: ^26
18+
- ios: ^18
19+
xcode: ^16
20+
- ios: ^17
1721
xcode: ^16
18-
# - macos: macos-15
19-
# ios: ^26
20-
# xcode: ^26
21-
# Note: iOS 26 simulator is not yet available on GitHub runners
2222
uses: ./.github/workflows/reusable-workflow.yaml
2323
with:
2424
ios: ${{ matrix.ios }}
2525
xcode: ${{ matrix.xcode }}
26-
macos: ${{ matrix.macos }}
2726
secrets: inherit

.github/workflows/pr.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
permission-check:
9-
runs-on: macos-15
9+
runs-on: macos-26
1010
env:
1111
BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
1212
steps:
@@ -33,18 +33,15 @@ jobs:
3333
needs: [permission-check]
3434
strategy:
3535
matrix:
36+
ios: [^26, ^18]
3637
include:
37-
- macos: macos-15
38-
ios: ^18
38+
- ios: ^26
39+
xcode: ^26
40+
- ios: ^18
3941
xcode: ^16
40-
# - macos: macos-15
41-
# ios: ^26
42-
# xcode: ^26
43-
# Note: iOS 26 simulator is not yet available on GitHub runners
4442
uses: ./.github/workflows/reusable-workflow.yaml
4543
with:
4644
is_pr: true
47-
macos: ${{ matrix.macos }}
48-
ios: ${{ matrix.ios }}
49-
xcode: ${{ matrix.xcode }}
45+
ios: ${{ matrix.include.ios }}
46+
xcode: ${{ matrix.include.xcode }}
5047
secrets: inherit

.github/workflows/reusable-workflow.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
required: false
1111
type: string
1212
macos:
13-
default: macos-15
13+
default: macos-26
1414
required: false
1515
type: string
1616
is_pr:
@@ -38,6 +38,9 @@ jobs:
3838
cd iosTests
3939
./prepareios.js
4040
./create_test_credentials_from_env.js
41+
- name: Install iOS 17 runtime if needed
42+
if: ${{ inputs.ios == '^17' }}
43+
run: xcodes runtimes install "iOS 17.5"
4144
- uses: mxcl/xcodebuild@v3
4245
with:
4346
xcode: ${{ inputs.xcode }}
@@ -54,7 +57,7 @@ jobs:
5457
show-code-coverage: false
5558
upload-bundles: false
5659
show-passed-tests: false
57-
if: success() || failure()
60+
if: success() || failure() && ${{ inputs.ios != '^26' }}
5861
- uses: codecov/codecov-action@v4
5962
env:
6063
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)