Skip to content

Commit

Permalink
[CI] Fix MacOS builds in Github Actions (#158)
Browse files Browse the repository at this point in the history
Use newer versions of Macos and Xcode that are available in Github Actions.
  • Loading branch information
uilianries authored Dec 29, 2024
1 parent 821c7d8 commit f513801
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 27 deletions.
38 changes: 13 additions & 25 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,22 @@ jobs:
fail-fast: false
matrix:
include:
- xcode: 11
build_type: Debug
os: macos-11
- xcode: 11
- xcode: 14
build_type: Release
os: macos-11
- xcode: 12
build_type: Debug
os: macos-11
- xcode: 12
os: macos-13
- xcode: 15
build_type: Release
os: macos-11
- xcode: 13
build_type: Debug
os: macos-12
- xcode: 13
os: macos-14
- xcode: 16
build_type: Release
os: macos-12
- xcode: 14
build_type: Debug
os: macos-12
- xcode: 14
build_type: Release
os: macos-12
os: macos-15
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- name: Install Ninja
run: brew install ninja

- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -54,10 +42,10 @@ jobs:
- run: cmake -E make_directory build

- working-directory: build/
run: cmake $GITHUB_WORKSPACE
run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}

- working-directory: build/
run: cmake --build . --config ${{ matrix.build_type }}
run: cmake --build .

- working-directory: build/
run: ctest --config ${{ matrix.build_type }} --output-on-failure
run: ctest --output-on-failure
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)

project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)

Expand Down

0 comments on commit f513801

Please sign in to comment.