From f30a9e3feb33008f525982d473e2dc38554de67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 28 Nov 2020 14:34:34 +0100 Subject: [PATCH] Move some Mac builds from Travis to GitHub Actions --- .github/workflows/linux-builds.yml | 2 +- .github/workflows/mac-builds.yml | 39 ++++++++++++++++++++++++++++++ .travis.yml | 15 ------------ 3 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/mac-builds.yml diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index b561fc3f..ac7b61b3 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - cxx: + cxx: # - g++-6 - g++-7 - g++-8 diff --git a/.github/workflows/mac-builds.yml b/.github/workflows/mac-builds.yml new file mode 100644 index 00000000..52057f47 --- /dev/null +++ b/.github/workflows/mac-builds.yml @@ -0,0 +1,39 @@ +name: Mac builds + +on: [push, pull_request] + +jobs: + build: + runs-on: macos-10.15 + strategy: + matrix: + cxx: + - g++-9 + - clang++ + build_type: [Debug, Release] + std: [14] + + steps: + - uses: actions/checkout@v2 + + - name: Configure build + working-directory: ${{runner.workspace}} + env: + CXX: ${{matrix.cxx}} + CXXFLAGS: ${{matrix.cxxflags}} + # 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 + + - name: Build tests + lib + working-directory: ${{runner.workspace}}/build + run: make -j 2 + + - name: Run tests + env: + CTEST_OUTPUT_ON_FAILURE: 1 + working-directory: ${{runner.workspace}}/build + # Hardcode 2 cores we know are there + run: ctest -C ${{matrix.build_type}} -j 2 diff --git a/.travis.yml b/.travis.yml index 7ab44fea..01763a8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,21 +128,6 @@ matrix: env: COMPILER='g++-7' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1 # OSX Clang Builds - - os: osx - osx_image: xcode9.4 - compiler: clang - env: COMPILER='clang++' CPP14=1 - - - os: osx - osx_image: xcode10.3 - compiler: clang - env: COMPILER='clang++' CPP14=1 - - - os: osx - osx_image: xcode11.2 - compiler: clang - env: COMPILER='clang++' CPP14=1 - - os: osx osx_image: xcode11.2 compiler: clang