Skip to content

Commit f513801

Browse files
authored
[CI] Fix MacOS builds in Github Actions (#158)
Use newer versions of Macos and Xcode that are available in Github Actions.
1 parent 821c7d8 commit f513801

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

.github/workflows/macos.yml

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,22 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- xcode: 11
20-
build_type: Debug
21-
os: macos-11
22-
- xcode: 11
19+
- xcode: 14
2320
build_type: Release
24-
os: macos-11
25-
- xcode: 12
26-
build_type: Debug
27-
os: macos-11
28-
- xcode: 12
21+
os: macos-13
22+
- xcode: 15
2923
build_type: Release
30-
os: macos-11
31-
- xcode: 13
32-
build_type: Debug
33-
os: macos-12
34-
- xcode: 13
24+
os: macos-14
25+
- xcode: 16
3526
build_type: Release
36-
os: macos-12
37-
- xcode: 14
38-
build_type: Debug
39-
os: macos-12
40-
- xcode: 14
41-
build_type: Release
42-
os: macos-12
27+
os: macos-15
4328
runs-on: ${{ matrix.os }}
4429

4530
steps:
46-
- uses: actions/checkout@v3
31+
- name: Install Ninja
32+
run: brew install ninja
33+
34+
- uses: actions/checkout@v4
4735
with:
4836
submodules: recursive
4937

@@ -54,10 +42,10 @@ jobs:
5442
- run: cmake -E make_directory build
5543

5644
- working-directory: build/
57-
run: cmake $GITHUB_WORKSPACE
45+
run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
5846

5947
- working-directory: build/
60-
run: cmake --build . --config ${{ matrix.build_type }}
48+
run: cmake --build .
6149

6250
- working-directory: build/
63-
run: ctest --config ${{ matrix.build_type }} --output-on-failure
51+
run: ctest --output-on-failure

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.10)
22

33
project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)
44

0 commit comments

Comments
 (0)