mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Add matrix element for examples to Travis configuration
This commit is contained in:
parent
85de0727d4
commit
d5d2bee4c5
10
.travis.yml
10
.travis.yml
@ -28,7 +28,7 @@ matrix:
|
|||||||
packages: ['valgrind', 'clang-3.6']
|
packages: ['valgrind', 'clang-3.6']
|
||||||
env: COMPILER='clang++-3.6' VALGRIND=1
|
env: COMPILER='clang++-3.6' VALGRIND=1
|
||||||
|
|
||||||
# Travis's containers do not seem to have Clang 3.7 in apt, no matter what sources I add.
|
# Travis's containers do not seem to have Clang 3.7 in apt, no matter what sources I add.
|
||||||
# - os: linux
|
# - os: linux
|
||||||
# compiler: clang
|
# compiler: clang
|
||||||
# addons:
|
# addons:
|
||||||
@ -110,6 +110,10 @@ matrix:
|
|||||||
packages: ['valgrind', 'g++-7']
|
packages: ['valgrind', 'g++-7']
|
||||||
env: COMPILER='g++-7' VALGRIND=1
|
env: COMPILER='g++-7' VALGRIND=1
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
compiler: gcc
|
||||||
|
addons: *gcc7
|
||||||
|
env: COMPILER='g++-7' ENV_NO_SELFTEST=1 ENV_BUILD_EXAMPLES=1
|
||||||
|
|
||||||
# 3b/ Linux C++14 Clang builds
|
# 3b/ Linux C++14 Clang builds
|
||||||
- os: linux
|
- os: linux
|
||||||
@ -200,8 +204,8 @@ before_script:
|
|||||||
- export CXX=${COMPILER}
|
- export CXX=${COMPILER}
|
||||||
- cd ${TRAVIS_BUILD_DIR}
|
- cd ${TRAVIS_BUILD_DIR}
|
||||||
# Only run valgrind in debug build
|
# Only run valgrind in debug build
|
||||||
- cmake -H. -BBuild-Debug -DCMAKE_BUILD_TYPE=Debug -Wdev -DUSE_CPP14=${CPP14} -DUSE_VALGRIND=${VALGRIND}
|
- cmake -H. -BBuild-Debug -DCMAKE_BUILD_TYPE=Debug -Wdev -DUSE_CPP14=${CPP14} -DUSE_VALGRIND=${VALGRIND} -DNO_SELFTEST=${ENV_NO_SELFTEST} -DBUILD_EXAMPLES=${ENV_BUILD_EXAMPLES}
|
||||||
- cmake -H. -BBuild-Release -DCMAKE_BUILD_TYPE=Release -Wdev -DUSE_CPP14=${CPP14}
|
- cmake -H. -BBuild-Release -DCMAKE_BUILD_TYPE=Release -Wdev -DUSE_CPP14=${CPP14} -DNO_SELFTEST=${ENV_NO_SELFTEST} -DBUILD_EXAMPLES=${ENV_BUILD_EXAMPLES}
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- cd Build-Debug
|
- cd Build-Debug
|
||||||
|
Loading…
Reference in New Issue
Block a user