Skip to content

Commit

Permalink
Update workflow to use catch2
Browse files Browse the repository at this point in the history
Signed-off-by: Ed Beroset <[email protected]>
  • Loading branch information
beroset committed Dec 18, 2023
1 parent a22f7e1 commit c333d6e
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit c333d6e

Please sign in to comment.