Skip to content

Commit d67d3eb

Browse files
committed
Update CI Xcode and macOS
1 parent 88db7f0 commit d67d3eb

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

.github/workflows/docs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ on:
99

1010
env:
1111
# Xcode 16.3 gets us Swift 6.1, required for docc merge
12-
XCODE_VERSION: 16.3
12+
XCODE_VERSION: 26.3
1313

1414
jobs:
1515
build:
1616
name: Generate API docs and publish to GitHub pages
17-
# macos-15 is required for Xcode 16.3
18-
runs-on: macos-15
17+
runs-on: macos-26
1918

2019
permissions:
2120
# Needed to push to gh-pages branch

.github/workflows/swift.yaml

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
pull_request:
1212

1313
env:
14-
XCODE_VERSION: 16.4.0
14+
XCODE_VERSION: 26.3
1515
TUIST_TEST_DEVICE: iPad (10th generation)
1616
TUIST_TEST_PLATFORM: iOS
1717

@@ -22,7 +22,7 @@ env:
2222

2323
jobs:
2424
development-tests:
25-
runs-on: macos-15
25+
runs-on: macos-26
2626

2727
name: "development-tests [iOS ${{ matrix.sdk }}]"
2828

@@ -41,8 +41,8 @@ jobs:
4141
simctl_runtime: "com.apple.CoreSimulator.SimRuntime.iOS-17-5"
4242
installation_required: true
4343

44-
- sdk: "18.5"
45-
simctl_runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-5"
44+
- sdk: "26.2"
45+
simctl_runtime: "com.apple.CoreSimulator.SimRuntime.iOS-26-2"
4646
installation_required: false
4747

4848
steps:
@@ -54,7 +54,9 @@ jobs:
5454

5555
- name: Install iOS ${{ matrix.sdk }}
5656
if: ${{ matrix.installation_required }}
57-
run: sudo xcodes runtimes install "iOS ${{ matrix.sdk }}"
57+
run: |
58+
sudo xcodes runtimes install "iOS ${{ matrix.sdk }}"
59+
xcrun simctl list
5860
5961
- name: Ensure sim exists
6062
run: |
@@ -69,16 +71,20 @@ jobs:
6971
- name: Run Tests
7072
run: tuist test --path Samples ${{ matrix.scheme }} --os "${{ matrix.sdk }}"
7173

72-
# FIXME: these should probably be run with a matrix too
7374
snapshot-tests:
74-
runs-on: macos-15
75+
runs-on: macos-26
7576

7677
env:
77-
TUIST_TEST_OS: 18.5
78+
TUIST_TEST_OS: 26.2
7879
TUIST_TEST_SCHEME: SnapshotTests
7980

8081
strategy:
8182
fail-fast: false # Don’t fail-fast so that we get all snapshot test changes
83+
matrix:
84+
include:
85+
- sdk: "26.2"
86+
simctl_runtime: "com.apple.CoreSimulator.SimRuntime.iOS-26-2"
87+
installation_required: false
8288

8389
steps:
8490
- uses: actions/checkout@v4
@@ -87,14 +93,27 @@ jobs:
8793
- name: Switch Xcode
8894
run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
8995

96+
- name: Install iOS ${{ matrix.sdk }}
97+
if: ${{ matrix.installation_required }}
98+
run: |
99+
sudo xcodes runtimes install "iOS ${{ matrix.sdk }}"
100+
xcrun simctl list
101+
102+
- name: Ensure sim exists
103+
run: |
104+
xcrun simctl create \
105+
"${{ env.TUIST_TEST_DEVICE }}" \
106+
"${{ env.TUIST_TEST_DEVICE }}" \
107+
"${{ matrix.simctl_runtime }}"
108+
90109
- name: Install dependencies
91110
run: tuist install --path Samples
92111

93112
- name: Run Snapshot Tests
94113
run: tuist test --path Samples
95114

96115
package-tests:
97-
runs-on: macos-15
116+
runs-on: macos-26
98117

99118
steps:
100119
- uses: actions/checkout@v4
@@ -108,7 +127,7 @@ jobs:
108127
run: swift test
109128

110129
tutorial:
111-
runs-on: macos-15
130+
runs-on: macos-26
112131

113132
steps:
114133
- uses: actions/checkout@v4
@@ -124,7 +143,7 @@ jobs:
124143
run: tuist test --path Samples/Tutorial TutorialTests
125144

126145
swiftformat:
127-
runs-on: macos-15
146+
runs-on: macos-26
128147

129148
steps:
130149
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)