Skip to content

Commit 6058d9a

Browse files
authored
Add more macOS builders (#3485)
* 👷 add more macOS builders * 👷 add more macOS builders * 💚 fix macOS build * 📝 document new Xcode versions
1 parent 046927c commit 6058d9a

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

.github/workflows/macos.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
jobs:
13-
xcode:
13+
xcode_1:
1414
runs-on: macos-10.15
1515
strategy:
1616
matrix:
@@ -27,8 +27,25 @@ jobs:
2727
- name: test
2828
run: cd build ; ctest -j 10 --output-on-failure
2929

30+
xcode_2:
31+
runs-on: macos-12
32+
strategy:
33+
matrix:
34+
xcode: [13.3.1, 13.3, 13.2.1, 13.2, 13.1]
35+
env:
36+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
37+
38+
steps:
39+
- uses: actions/checkout@v3
40+
- name: cmake
41+
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON
42+
- name: build
43+
run: cmake --build build --parallel 10
44+
- name: test
45+
run: cd build ; ctest -j 10 --output-on-failure
46+
3047
xcode_standards:
31-
runs-on: macos-10.15
48+
runs-on: macos-latest
3249
strategy:
3350
matrix:
3451
standard: [11, 14, 17, 20]

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,11 @@ The following compilers are currently used in continuous integration at [AppVeyo
10871087
| Apple Clang 12.0.0 (clang-1200.0.32.27); Xcode 12.2 | macOS 10.15.7 | GitHub Actions |
10881088
| Apple Clang 12.0.0 (clang-1200.0.32.28); Xcode 12.3 | macOS 10.15.7 | GitHub Actions |
10891089
| Apple Clang 12.0.0 (clang-1200.0.32.29); Xcode 12.4 | macOS 10.15.7 | GitHub Actions |
1090+
| Apple Clang 13.0.0 (clang-1300.0.29.3); Xcode 13.1 | macOS 12.3.1 | GitHub Actions |
1091+
| Apple Clang 13.0.0 (clang-1300.0.29.30); Xcode 13.2 | macOS 12.3.1 | GitHub Actions |
1092+
| Apple Clang 13.0.0 (clang-1300.0.29.30); Xcode 13.2.1 | macOS 12.3.1 | GitHub Actions |
1093+
| Apple Clang 13.1.6 (clang-1316.0.21.2); Xcode 13.3 | macOS 12.3.1 | GitHub Actions |
1094+
| Apple Clang 13.1.6 (clang-1316.0.21.2.3); Xcode 13.3.1 | macOS 12.3.1 | GitHub Actions |
10901095
| Clang 3.5.2 (3.5.2-3ubuntu1) | Ubuntu 20.04.3 LTS | GitHub Actions |
10911096
| Clang 3.6.2 (3.6.2-3ubuntu2) | Ubuntu 20.04.3 LTS | GitHub Actions |
10921097
| Clang 3.7.1 (3.7.1-2ubuntu2) | Ubuntu 20.04.3 LTS | GitHub Actions |

0 commit comments

Comments
 (0)