diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 345edfbb..0fe2abb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ common_sources: &all_sources - llvm-toolchain-trusty - llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-4.0 - - llvm-toolchain-trusty-5.0 - - llvm-toolchain-trusty-6.0 + - llvm-toolchain-xenial-5.0 + - llvm-toolchain-xenial-6.0 matrix: include: @@ -60,6 +60,7 @@ matrix: env: COMPILER='clang++-4.0' - os: linux + dist: xenial compiler: clang addons: apt: @@ -68,6 +69,7 @@ matrix: env: COMPILER='clang++-5.0' - os: linux + dist: xenial compiler: clang addons: apt: @@ -153,6 +155,7 @@ matrix: env: COMPILER='clang++-4.0' CPP14=1 - os: linux + dist: xenial compiler: clang addons: apt: @@ -161,6 +164,7 @@ matrix: env: COMPILER='clang++-5.0' CPP14=1 - os: linux + dist: xenial compiler: clang addons: apt: @@ -255,6 +259,7 @@ matrix: env: COMPILER='g++-7' EXAMPLES=1 COVERAGE=1 EXTRAS=1 CPP17=1 - os: linux + dist: xenial compiler: clang addons: apt: @@ -263,6 +268,7 @@ matrix: env: COMPILER='clang++-6.0' CPP17=1 - os: linux + dist: xenial compiler: clang addons: apt: @@ -276,7 +282,7 @@ matrix: - "3.7" dist: xenial install: - - pip install conan==1.10.2 conan-package-tools + - pip install conan-package-tools env: - CONAN_GCC_VERSIONS=8 - CONAN_DOCKER_IMAGE=conanio/gcc8 @@ -301,10 +307,19 @@ before_script: # Regenerate single header file, so it is tested in the examples... - python scripts/generateSingleHeader.py + - | + if [[ ${CPP17} -eq 1 ]]; then + export CPP_STANDARD=17 + elif [[ ${CPP14} -eq 1 ]]; then + export CPP_STANDARD=14 + else + export CPP_STANDARD=11 + fi + # Use Debug builds for running Valgrind and building examples - - cmake -H. -BBuild-Debug -DCMAKE_BUILD_TYPE=Debug -Wdev -DUSE_CPP14=${CPP14} -DUSE_CPP17=${CPP17} -DCATCH_USE_VALGRIND=${VALGRIND} -DCATCH_BUILD_EXAMPLES=${EXAMPLES} -DCATCH_ENABLE_COVERAGE=${COVERAGE} -DCATCH_BUILD_EXTRA_TESTS=${EXTRAS} + - cmake -H. -BBuild-Debug -DCMAKE_BUILD_TYPE=Debug -Wdev -DCATCH_USE_VALGRIND=${VALGRIND} -DCATCH_BUILD_EXAMPLES=${EXAMPLES} -DCATCH_ENABLE_COVERAGE=${COVERAGE} -DCATCH_BUILD_EXTRA_TESTS=${EXTRAS} -DCMAKE_CXX_STANDARD=${CPP_STANDARD} -DCMAKE_CXX_STANDARD_REQUIRED=On -DCMAKE_CXX_EXTENSIONS=OFF # Don't bother with release build for coverage build - - cmake -H. -BBuild-Release -DCMAKE_BUILD_TYPE=Release -Wdev -DUSE_CPP14=${CPP14} -DUSE_CPP17=${CPP17} + - cmake -H. -BBuild-Release -DCMAKE_BUILD_TYPE=Release -Wdev -DCMAKE_CXX_STANDARD=${CPP_STANDARD} -DCMAKE_CXX_STANDARD_REQUIRED=On -DCMAKE_CXX_EXTENSIONS=OFF script: |