Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Move Examples and ExtraTests Mac builds to Github Actions

Commit
1d746a15ac3de5dfa8244eb4b3d773a463519fb0
Author
Martin Hořeňovský ·
Parents
19cbdebb0e90

Files · Download .tar.gz

Changes

 .github/workflows/mac-builds.yml | 10 ++++++++--
 .travis.yml                      |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/mac-builds.yml b/.github/workflows/mac-builds.yml
index 52057f47..edbae88a 100644
--- a/.github/workflows/mac-builds.yml
+++ b/.github/workflows/mac-builds.yml
@@ -12,6 +12,10 @@ jobs:
           - clang++
         build_type: [Debug, Release]
         std: [14]
+        include:
+          - build_type: Debug
+            examples: ON
+            extra_tests: ON
 
     steps:
     - uses: actions/checkout@v2
@@ -24,8 +28,10 @@ jobs:
       # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
       #       This is important
       run: |
-        cmake -Bbuild -H$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} -DCATCH_DEVELOPMENT_BUILD=ON
+        cmake -Bbuild -H$GITHUB_WORKSPACE \
+              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} \
+              -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
+              -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}}
 
     - name: Build tests + lib
       working-directory: ${{runner.workspace}}/build
diff --git a/.travis.yml b/.travis.yml
index 01763a8a..b8a6268d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,13 +127,6 @@ matrix:
           packages: ['g++-7', 'lcov']
       env: COMPILER='g++-7' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
 
-    # OSX Clang Builds
-    - os: osx
-      osx_image: xcode11.2
-      compiler: clang
-      env: COMPILER='clang++' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
-
-
 
     # Special builds, e.g. conan
     - language: python