diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f9b728b8..8e1a99c4 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ff23e5..b2c8045a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/external/PEGTL b/external/PEGTL index d7b821b1..3c6e0e09 160000 --- a/external/PEGTL +++ b/external/PEGTL @@ -1 +1 @@ -Subproject commit d7b821b1e5ed6ab321625f50427c4ae0b78909d5 +Subproject commit 3c6e0e092ca77868ea3a0b0f47b5948dc07c1c86