From 311730bc3dbf09b4b739ea682fe406eb4f5499b5 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 28 May 2021 22:23:50 +0200 Subject: [PATCH 1/4] :construction_worker: add C++ standards to macOS matrix #2491 --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 42e9098b56..22d81a05fd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,13 +13,14 @@ jobs: strategy: matrix: xcode: [12.4, 12.3, 12.2, 12.1.1, 12.1, 12, 11.7, 11.6, 11.5, 11.4.1, 11.3.1, 11.2.1, 10.3] + standard: [11, 14, 17, 20] env: DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer steps: - uses: actions/checkout@v2 - name: cmake - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON + run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_STANDARD={{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON - name: build run: cmake --build build --parallel 10 - name: test From 9f5ee3f1453bc2921bee720c99868ebfcdace4cd Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 28 May 2021 22:27:46 +0200 Subject: [PATCH 2/4] :construction_worker: fix syntax --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 22d81a05fd..ecc51d6f5a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: cmake - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_STANDARD={{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON + run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON - name: build run: cmake --build build --parallel 10 - name: test From 2b685c744bacd31cfd286a05de5d512bd142a2e9 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 29 May 2021 13:10:28 +0200 Subject: [PATCH 3/4] :construction_worker: reduce load --- .github/workflows/macos.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ecc51d6f5a..13d1192fd3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,10 +13,26 @@ jobs: strategy: matrix: xcode: [12.4, 12.3, 12.2, 12.1.1, 12.1, 12, 11.7, 11.6, 11.5, 11.4.1, 11.3.1, 11.2.1, 10.3] - standard: [11, 14, 17, 20] env: DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer + steps: + - uses: actions/checkout@v2 + - name: cmake + run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON + - name: build + run: cmake --build build --parallel 10 + - name: test + run: cd build ; ctest -j 10 --output-on-failure + + xcode_standards: + runs-on: macos-10.15 + strategy: + matrix: + standard: [11, 14, 17, 20] + env: + DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer + steps: - uses: actions/checkout@v2 - name: cmake From 30e52eb0464bb7654da7393bc2804b7a15662d24 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 30 May 2021 13:28:58 +0200 Subject: [PATCH 4/4] :construction_worker: execute all tests --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 13d1192fd3..bf9549fcf8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: cmake - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON + run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DCMAKE_CXX_STANDARD_REQUIRED=ON - name: build run: cmake --build build --parallel 10 - name: test