Fix CI (#4954)

* 🚨 suppress readability-redundant-parentheses Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress google-runtime-float Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress bugprone-throwing-static-initialization Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress bugprone-throwing-static-initialization Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress bugprone-throwing-static-initialization Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress bugprone-throwing-static-initialization Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🚨 suppress bugprone-throwing-static-initialization Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🗑️ do not use macos-13 image Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ use more Xcode versions Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * ⚗️ fix Clang build Signed-off-by: Niels Lohmann <mail@nlohmann.me> * 🔨 clean up Signed-off-by: Niels Lohmann <mail@nlohmann.me> --------- Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2025-11-23 19:34:10 +08:00 · 2025-10-22 11:14:01 +02:00
parent 3ed64e502a
commit 2566828ed5
11 changed files with 54 additions and 39 deletions
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -53,28 +53,29 @@ jobs:
 #      - name: Test
 #        run: cd build ; ctest -j 10 --output-on-failure

-  macos-13:
-    runs-on: macos-13 # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
-    strategy:
-      matrix:
-        xcode: ['14.1', '14.2', '14.3', '14.3.1', '15.0.1', '15.1', '15.2']
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
-
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Run 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
+# macos-13 is deprecated (https://github.com/actions/runner-images/issues/13046)
+#  macos-13:
+#    runs-on: macos-13 # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+#    strategy:
+#      matrix:
+#        xcode: ['14.1', '14.2', '14.3', '14.3.1', '15.0.1', '15.1', '15.2']
+#    env:
+#      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+#
+#    steps:
+#      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+#      - name: Run 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

  macos-14:
    runs-on: macos-14 # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
    strategy:
      matrix:
-        xcode: ['15.3', '15.4']
+        xcode: ['15.0.1', '15.1', '15.2', '15.3', '15.4']
    env:
      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

@@ -91,7 +92,7 @@ jobs:
    runs-on: macos-15 # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
    strategy:
      matrix:
-        xcode: ['16.0', '16.1', '16.2', '16.3']
+        xcode: ['16.0', '16.1', '16.2', '16.3', '16.4', '26.0.1']
    env:
      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -80,8 +80,19 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: Install Clang
        run: curl -fsSL -o LLVM${{ matrix.version }}.exe https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.version }}/LLVM-${{ matrix.version }}-win64.exe ; 7z x LLVM${{ matrix.version }}.exe -y -o"C:/Program Files/LLVM"
+      - name: Set up MinGW
+        uses: egor-tensin/setup-mingw@84c781b557efd538dec66bde06988d81cd3138cf # v2.2.0
+        with:
+          platform: x64
+          version: 12.2.0 # https://github.com/egor-tensin/setup-mingw/issues/14
      - name: Run CMake
-        run: cmake -S . -B build -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" -DCMAKE_CXX_FLAGS="--target=x86_64-w64-mingw32 -stdlib=libstdc++ -pthread" -DCMAKE_EXE_LINKER_FLAGS="-lwinpthread" -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
+        run: cmake -S . -B build ^
+             -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" ^
+             -DCMAKE_CXX_FLAGS="--target=x86_64-w64-mingw32 -stdlib=libstdc++ -pthread" ^
+             -DCMAKE_EXE_LINKER_FLAGS="-lwinpthread" ^
+             -G"MinGW Makefiles" ^
+             -DCMAKE_BUILD_TYPE=Debug ^
+             -DJSON_BuildTests=On
      - name: Build
        run: cmake --build build --parallel 10
      - name: Test