3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-30 01:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup travis.yml: remove duplicate compilers, remove unused flag

Browse Source
This commit is contained in:
Martin Hořeňovský 2017-11-05 12:46:04 +01:00
parent 7a562d39b2
commit b2dd48f0c0
1 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.travis.yml
View File

@ -117,27 +117,21 @@ matrix:
addons: *gcc6 addons: *gcc6
env: COMPILER='g++-6' BUILD_TYPE='Debug' env: COMPILER='g++-6' BUILD_TYPE='Debug'
# 3a/ Linux C++11 GCC builds # 3b/ Linux C++14 Clang builds
- os: linux
compiler: gcc
addons: *gcc48
env: COMPILER='g++-4.8' BUILD_TYPE='Release' CPP11=1
- os: linux
compiler: gcc
addons: *gcc48
env: COMPILER='g++-4.8' BUILD_TYPE='Debug' CPP11=1
# 3b/ Linux C++11 Clang builds
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang38 addons: &clang38cpp14
env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=1 apt:
packages: ["clang-3.8", "libstdc++-6-dev"]
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty
env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang38 addons: *clang38cpp14
env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=1 env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP14=1
# 4a/ Linux C++14 GCC builds # 4a/ Linux C++14 GCC builds
- os: linux - os: linux
@ -150,18 +144,6 @@ matrix:
addons: *gcc6 addons: *gcc6
env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP14=1 env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP14=1
# # 4b/ Linux C++14 Clang builds
# - os: linux
# compiler: clang
# addons: *clang38
# env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1
#
# - os: linux
# compiler: clang
# addons: *clang38
# env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP14=1
# 5/ OSX Clang Builds # 5/ OSX Clang Builds
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
@ -183,16 +165,6 @@ matrix:
compiler: clang compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Release' env: COMPILER='clang++' BUILD_TYPE='Release'
- os: osx
osx_image: xcode8
compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Debug' USE_CPP11=1
- os: osx
osx_image: xcode8
compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Release' USE_CPP11=1
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
compiler: clang compiler: clang
@ -219,7 +191,7 @@ install:
before_script: before_script:
- export CXX=${COMPILER} - export CXX=${COMPILER}
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP11=${CPP11} -DUSE_CPP14=${CPP14} - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP14=${CPP14}
- cd Build - cd Build
script: script: