Skip to content

Commit c4a76dc

Browse files
authored
Fix CI (#141)
* Fix CI GitHub quietly dropped Xcode 16 support for macOS 14, and does not support Xcode <16 on macOS 14, so we have to update our workflow to account for these mismatches. * wip * wip
1 parent 05c9f02 commit c4a76dc

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,24 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
macos:
16+
macos-15:
17+
strategy:
18+
matrix:
19+
config:
20+
- debug
21+
- release
22+
xcode:
23+
- '16.0'
24+
name: macOS 15
25+
runs-on: macos-15
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Select Xcode
29+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
30+
- name: Run tests
31+
run: make test-${{ matrix.config }}
32+
33+
macos-14:
1734
strategy:
1835
matrix:
1936
config:
@@ -22,8 +39,7 @@ jobs:
2239
xcode:
2340
- 15.2
2441
- 15.4
25-
- '16.0'
26-
name: macOS
42+
name: macOS 14
2743
runs-on: macos-14
2844
steps:
2945
- uses: actions/checkout@v4
@@ -34,7 +50,7 @@ jobs:
3450

3551
library-evolution:
3652
name: Library evolution
37-
runs-on: macos-14
53+
runs-on: macos-15
3854
steps:
3955
- uses: actions/checkout@v4
4056
- name: Select Xcode
@@ -49,10 +65,9 @@ jobs:
4965
- Debug
5066
- Release
5167
xcode:
52-
- 15.4
5368
- '16.0'
5469
name: Examples
55-
runs-on: macos-14
70+
runs-on: macos-15
5671
steps:
5772
- uses: actions/checkout@v4
5873
- name: Select Xcode

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test-examples:
2222
-configuration $(CONFIG) \
2323
-workspace IssueReporting.xcworkspace \
2424
-scheme Examples \
25-
-destination platform="iOS Simulator,name=iPhone 15"
25+
-destination platform="iOS Simulator,name=iPhone 16"
2626

2727
test-wasm:
2828
echo wasm-DEVELOPMENT-SNAPSHOT-2024-07-16-a > .swift-version

0 commit comments

Comments
 (0)