From db90d94c4d8fc7a1744a3e3a833f5e4924cfcf35 Mon Sep 17 00:00:00 2001 From: axionbuster Date: Mon, 12 Feb 2024 07:54:29 -0800 Subject: [PATCH] Set up continuous testing Linux, Windows, and macOS. - Can it build? - Does it pass all tests? --- .github/workflows/cmake-multi-platform.yml | 103 +++++++++++++++++++++ .gitignore | 3 + .idea/misc.xml | 11 +++ CMakeLists.txt | 6 +- tests/CMakeLists.txt | 8 +- 5 files changed, 126 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/cmake-multi-platform.yml diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml new file mode 100644 index 0000000..0ad8513 --- /dev/null +++ b/.github/workflows/cmake-multi-platform.yml @@ -0,0 +1,103 @@ +name: CMake on multiple platforms + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: true + + matrix: + os: [ ubuntu-latest, windows-latest, macos-latest ] + c_compiler: [ gcc, clang-17, cl, clang ] + build_type: [ RelWithDebInfo ] + exclude: + - os: ubuntu-latest + c_compiler: cl + - os: ubuntu-latest + c_compiler: clang + - os: windows-latest + c_compiler: gcc + - os: windows-latest + c_compiler: clang-17 + - os: windows-latest + c_compiler: clang + - os: macos-latest + c_compiler: gcc + - os: macos-latest + c_compiler: clang-17 + - os: macos-latest + c_compiler: cl + include: + - os: ubuntu-latest + c_compiler: gcc + cpp_compiler: g++ + - os: ubuntu-latest + c_compiler: clang-17 + cpp_compiler: clang++-17 + - os: windows-latest + c_compiler: cl + cpp_compiler: cl + - os: macos-latest + c_compiler: clang + cpp_compiler: clang++ + + steps: + - uses: actions/checkout@v3 + + - name: Set reusable strings + # Turn repeated input strings (such as the build output directory) into step outputs. + # These step outputs can be used throughout the workflow file. + id: strings + shell: bash + run: | + echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + + - name: Install Clang 17 (Ubuntu with Clang) + if: matrix.os == 'ubuntu-latest' && matrix.c_compiler == 'clang-17' + run: | + wget https://apt.llvm.org/llvm.sh + chmod u+x ./llvm.sh + sudo ./llvm.sh 17 + + - name: Install Raylib dependencies (Ubuntu) + id: install-deps-u + if: matrix.os == 'ubuntu-latest' + run: > + sudo apt install libasound2-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev + libxcursor-dev libxinerama-dev + + - name: Install Clang 17 (macOS) + if: matrix.os == 'macos-latest' + run: | + brew install llvm@17 + echo "/usr/local/opt/llvm/bin" >> "$GITHUB_PATH" + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. + # `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: > + cmake -B ${{ steps.strings.outputs.build-output-dir }} + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -S ${{ github.workspace }} + + - name: Build + # Build your program with the given configuration. Note that --config is needed because the default Windows + # generator is a multi-config generator (Visual Studio generator). + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + + - name: Test + working-directory: ${{ steps.strings.outputs.build-output-dir }} + # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default + # Windows generator is a multi-config generator (Visual Studio generator). + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest --build-config ${{ matrix.build_type }} diff --git a/.gitignore b/.gitignore index a8e7dbc..a0fece6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ /vc140.idb /vc140.pdb /cmake-build-* +/Testing/Temporary +/tests/Testing/Temporary/CTestCostData.txt +/tests/Testing/Temporary/LastTest.log diff --git a/.idea/misc.xml b/.idea/misc.xml index 79b3c94..f4f3d68 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f16a17..be68a2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,4 +5,8 @@ set(CMAKE_CXX_STANDARD 20) add_subdirectory(demo) add_subdirectory(dyn) -add_subdirectory(tests) + +include(CTest) +if (BUILD_TESTING) + add_subdirectory(tests) +endif () diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7a62a44..cb27347 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,12 +6,12 @@ FetchContent_Declare( ) # For Windows: Prevent overriding the parent project's compiler/linker settings set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -FetchContent_MakeAvailable(googletest) +FetchContent_MakeAvailable(GoogleTest) +include(GoogleTest) # Now simply link against gtest or gtest_main as needed. Eg add_executable(units yoshida_test.cpp newton_test.cpp) -target_link_libraries(units gtest_main) target_precompile_headers(units INTERFACE "gtest/gtest.h") - -target_link_libraries(units dyn) +target_link_libraries(units gtest_main dyn) +gtest_discover_tests(units)