Skip to content

Commit 08cf0f4

Browse files
committed
upgrade macos CI to Monterey, and simplify device build matrix
1 parent 8933aed commit 08cf0f4

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

.github/workflows/build-devices.yml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,16 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
build-ios:
10+
build-macos:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [macos-11, macos-10.15]
14+
os: [macos-12, macos-11]
15+
device: [ios, tvos, watchos]
1516
steps:
1617
- uses: actions/checkout@v2
1718
- name: build
1819
run: |
1920
swift --version
20-
xcrun xcodebuild build -scheme "CRC" -destination "generic/platform=ios"
21-
xcrun xcodebuild build -scheme "SHA2" -destination "generic/platform=ios"
22-
build-tvos:
23-
runs-on: ${{ matrix.os }}
24-
strategy:
25-
matrix:
26-
os: [macos-11, macos-10.15]
27-
steps:
28-
- uses: actions/checkout@v2
29-
- name: build
30-
run: |
31-
swift --version
32-
xcrun xcodebuild build -scheme "CRC" -destination "generic/platform=tvos"
33-
xcrun xcodebuild build -scheme "SHA2" -destination "generic/platform=tvos"
34-
build-watchos:
35-
runs-on: ${{ matrix.os }}
36-
strategy:
37-
matrix:
38-
os: [macos-11, macos-10.15]
39-
steps:
40-
- uses: actions/checkout@v2
41-
- name: build
42-
run: |
43-
swift --version
44-
xcrun xcodebuild build -scheme "CRC" -destination "generic/platform=watchos"
45-
xcrun xcodebuild build -scheme "SHA2" -destination "generic/platform=watchos"
21+
xcrun xcodebuild build -scheme "CRC" -destination "generic/platform=${{ matrix.device }}"
22+
xcrun xcodebuild build -scheme "SHA2" -destination "generic/platform=${{ matrix.device }}"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [macos-11, macos-10.15]
14+
os: [macos-12, macos-11]
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: build

0 commit comments

Comments
 (0)