Updated test.yaml to ignore the Python module for the C++ tests.

Updated the C++ dependencies.

Decided against switching to vcpkg for now, but may look at it again at a later date.

Author: JackAshwell11

.github/workflows/build.yaml

@@ -25,9 +25,7 @@ jobs:
           virtualenvs-create: true
           virtualenvs-in-project: true
       - name: Install Python dependencies
-        run: |
-          poetry --version
-          poetry install --no-interaction
+        run: poetry install --no-interaction
       - name: Build the game
         run: python -m build --executable
       - name: Upload the release

.github/workflows/test.yaml

@@ -45,19 +45,23 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.1.1
+      - name: Set up MSVC
+        uses: ilammy/msvc-dev-cmd@v1.12.1
       - name: Set up CMake
         uses: lukka/get-cmake@v3.27.7
-      - name: Configure and build CMake
+      - name: Build CMake and run CTest
         working-directory: ${{ github.workspace }}/src/hades_extensions
         run: |
-          cmake --preset Coverage
+          cmake -DDO_PYTHON=OFF --preset Coverage
           cmake --build build-coverage
-      - name: Run CTest and generate the coverage report
+          ctest --output-on-failure --no-tests=error --test-dir ${{ github.workspace }}/src/hades_extensions/build-coverage/tests
+      - name: Generate the coverage report
+        if: matrix.os == 'ubuntu-latest'
         run: |
           pip install gcovr
-          ctest --output-on-failure --no-tests=error --test-dir ${{ github.workspace }}/src/hades_extensions/build-coverage/tests
           gcovr -r ${{ github.workspace }} --exclude src/hades_extensions/build-coverage --exclude src/hades_extensions/tests --exclude src/hades_extensions/src/binding.cpp --coveralls coverage.json
       - name: Upload coverage report
+        if: matrix.os == 'ubuntu-latest'
         uses: coverallsapp/github-action@v2.2.3
         with:
           file: coverage.json

src/hades_extensions/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(ENABLE_COVERAGE OFF CACHE BOOL "Enable coverage reporting for GCC/Clang")
-set(ENABLE_STATIC_ANALYSIS OFF CACHE BOOL "Enable static analysis using clang-tidy")
+set(DO_PYTHON ON CACHE BOOL "Enable Python bindings")
 set(DO_TESTS ON CACHE BOOL "Enable testing")
 
 # Define the module names and initialise the project
@@ -40,6 +40,5 @@ if (DO_TESTS)
     add_subdirectory(tests)
 endif ()
 
-# TODO: maybe add vcpkg to the c++ project
 # TODO: maybe switch to catch2
 # TODO: maybe change the components to pass by value and use std::move to signify that ownership is being transferred (or find another way)

src/hades_extensions/src/CMakeLists.txt

@@ -3,7 +3,7 @@ find_package(Python COMPONENTS Interpreter Development REQUIRED)
 FetchContent_Declare(
         pybind11_source
         GIT_REPOSITORY https://github.com/pybind/pybind11.git
-        GIT_TAG v2.10.3
+        GIT_TAG v2.11.1
 )
 FetchContent_GetProperties(pybind11_source)
 FetchContent_Populate(pybind11_source)
@@ -30,5 +30,7 @@ add_library(${CPP_LIB} STATIC
 target_include_directories(${CPP_LIB} PUBLIC ${CMAKE_SOURCE_DIR}/include)
 
 # Create the Python module
-pybind11_add_module(${PY_MODULE} ${CMAKE_SOURCE_DIR}/src/binding.cpp)
-target_link_libraries(${PY_MODULE} PRIVATE ${CPP_LIB})
+if (DO_PYTHON)
+    pybind11_add_module(${PY_MODULE} ${CMAKE_SOURCE_DIR}/src/binding.cpp)
+    target_link_libraries(${PY_MODULE} PRIVATE ${CPP_LIB})
+endif ()

src/hades_extensions/tests/CMakeLists.txt

@@ -2,7 +2,7 @@
 FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG v1.13.0
+        GIT_TAG v1.14.0
 )
 set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" FORCE)
 FetchContent_MakeAvailable(googletest)