From c333d6e35a6c746b74dd777957dbe5fe76ceb419 Mon Sep 17 00:00:00 2001 From: Ed Beroset Date: Mon, 18 Dec 2023 08:21:24 -0500 Subject: [PATCH] Update workflow to use catch2 Signed-off-by: Ed Beroset --- .github/workflows/cmake.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index bf0d2e5..ec5ab0e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 @@ -24,12 +24,10 @@ jobs: run: | if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get update - sudo apt-get install libcppunit-dev - elif [ "$RUNNER_OS" == "Windows" ]; then - echo "Windows does not support cppunit testing" + sudo apt-get install catch2 elif [ "$RUNNER_OS" == "macOS" ]; then brew update - brew install cppunit + brew install catch2 else echo "$RUNNER_OS is not supported" exit 1 @@ -50,9 +48,7 @@ jobs: # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 run: | - if [ "$RUNNER_OS" == "Windows" ]; then - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_TEST=OFF - elif [ "$RUNNER_OS" == "macOS" ]; then + if [ "$RUNNER_OS" == "macOS" ]; then cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_TEST=ON else cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_TEST=ON