From 9f7434bc6ef03cdc8eb0273628a84694343a38bc Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Wed, 7 Aug 2024 00:41:17 +0900 Subject: [PATCH 1/4] ci: add osx-14 to build envs --- .github/workflows/main.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36a68be..5a9b3a0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -126,6 +126,30 @@ jobs: run: | ctest --output-on-failure --test-dir build/ + build-osx-14: + runs-on: macos-14 + strategy: + matrix: + standard: ['11', '14', '17', '20'] + precompile: ['ON', 'OFF'] + steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores + - name: Checkout + uses: actions/checkout@v4 + with: + submodules: true + - name: Configure + run: | + cmake -B build/ -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_BUILD_TESTS=ON -DTOML11_PRECOMPILE=${{ matrix.precompile }} + - name: Build + run: | + cmake --build build/ -j${{ steps.cpu-cores.outputs.count }} + - name: Test + run: | + ctest --output-on-failure --test-dir build/ + build-osx-13: runs-on: macos-13 strategy: From 6421df3c6db58b4b2f371519c4c5eaf1507d52c7 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Wed, 7 Aug 2024 00:41:33 +0900 Subject: [PATCH 2/4] ci: add missing cpu-cores var --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a9b3a0..14d4f2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,9 @@ jobs: - {compiler: '12', standard: '20'} - {compiler: '11', standard: '20'} steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: @@ -75,6 +78,9 @@ jobs: - {compiler: 'g++-8', standard: '17'} - {compiler: 'g++-8', standard: '20'} steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: @@ -107,6 +113,9 @@ jobs: - {compiler: '8', standard: '20'} - {compiler: '9', standard: '20'} steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: @@ -157,6 +166,9 @@ jobs: standard: ['11', '14', '17', '20'] precompile: ['ON', 'OFF'] steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: @@ -178,6 +190,9 @@ jobs: standard: ['11', '14', '17', '20'] precompile: ['ON', 'OFF'] steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: @@ -200,6 +215,9 @@ jobs: config: ['Release', 'Debug'] precompile: ['ON', 'OFF'] steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores - name: Checkout uses: actions/checkout@v4 with: From df8f978f3ddd591f3d24ca1a9cf90c4a9a6b8427 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Wed, 7 Aug 2024 23:57:31 +0900 Subject: [PATCH 3/4] ci: add macos with latest (unstable) xcode --- .github/workflows/main.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14d4f2a..0ba9948 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -135,6 +135,34 @@ jobs: run: | ctest --output-on-failure --test-dir build/ + build-osx-latest: + runs-on: macos-latest + strategy: + matrix: + standard: ['11', '14', '17', '20'] + precompile: ['ON', 'OFF'] + steps: + - name: Get number of CPU cores + uses: SimenB/github-actions-cpu-cores@v2 + id: cpu-cores + - name: Set xcode latest unstable + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest + - name: Checkout + uses: actions/checkout@v4 + with: + submodules: true + - name: Configure + run: | + cmake -B build/ -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_BUILD_TESTS=ON -DTOML11_PRECOMPILE=${{ matrix.precompile }} + - name: Build + run: | + cmake --build build/ -j${{ steps.cpu-cores.outputs.count }} + - name: Test + run: | + ctest --output-on-failure --test-dir build/ + build-osx-14: runs-on: macos-14 strategy: From 834ec3a835124f43b8e802da85b8eb933f1aaff4 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Thu, 8 Aug 2024 00:58:00 +0900 Subject: [PATCH 4/4] feat: include for terminate --- include/toml11/fwd/comments_fwd.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/toml11/fwd/comments_fwd.hpp b/include/toml11/fwd/comments_fwd.hpp index cd5bf0f..bbc9926 100644 --- a/include/toml11/fwd/comments_fwd.hpp +++ b/include/toml11/fwd/comments_fwd.hpp @@ -4,6 +4,7 @@ // to use __has_builtin #include "../version.hpp" // IWYU pragma: keep +#include #include #include #include