Merge pull request #351 from Nordix/ci-updates

CI updates

Author: mikkelfj

.github/workflows/ci.yml

@@ -42,9 +42,6 @@ jobs:
     name: macOS
     runs-on: macos-14
     steps:
-      - name: Prepare
-        run: |
-          brew install ninja
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Build and run tests
         run: |

.github/workflows/weekly.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        clang-version: [5, 7, 9, 11, 13, 15, 17, 18, 19]
+        clang-version: [5, 7, 9, 11, 13, 15, 17, 19, 20]
     steps:
       - name: Setup Clang
         uses: aminya/setup-cpp@a276e6e3d1db9160db5edc458e99a30d3b109949 # v1.7.1
@@ -204,7 +204,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [2019, 2022]
+        version: [2022, 2025]
     steps:
       - uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

test/monster_test_cpp/CMakeLists.txt

@@ -1,6 +1,12 @@
 include(CTest)
 
 # Note: This re-uses the samples/monster fbs and .c file.
+# According to the C++ standard Section 6.9.3.1 of ISO/IEC 14882:2024
+# "an entity named main with C language linkage (in any namespace) is ill-formed"
+# Let's disable the warning from Clang that we include main() using extern "C".
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-Wno-main)
+endif()
 
 set(INC_DIR "${PROJECT_SOURCE_DIR}/include")
 # We use our own separate gen dir so we don't clash with the real monster sample.