mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Move some Mac builds from Travis to GitHub Actions
This commit is contained in:
parent
e7740316e3
commit
f30a9e3feb
2
.github/workflows/linux-builds.yml
vendored
2
.github/workflows/linux-builds.yml
vendored
@ -7,7 +7,7 @@ jobs:
|
|||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
cxx:
|
cxx:
|
||||||
# - g++-6
|
# - g++-6
|
||||||
- g++-7
|
- g++-7
|
||||||
- g++-8
|
- g++-8
|
||||||
|
39
.github/workflows/mac-builds.yml
vendored
Normal file
39
.github/workflows/mac-builds.yml
vendored
Normal file
@ -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
|
15
.travis.yml
15
.travis.yml
@ -128,21 +128,6 @@ matrix:
|
|||||||
env: COMPILER='g++-7' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
|
env: COMPILER='g++-7' CPP14=1 EXAMPLES=1 COVERAGE=1 EXTRAS=1
|
||||||
|
|
||||||
# OSX Clang Builds
|
# 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
|
- os: osx
|
||||||
osx_image: xcode11.2
|
osx_image: xcode11.2
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
Loading…
Reference in New Issue
Block a user