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

Minor .travis.yml cleanup

Browse Source 
Still could use someone more experienced to clean it up properly...
This commit is contained in:
Martin Hořeňovský 2017-04-20 22:50:07 +02:00
parent 417b2bcf5c
commit a49af4648c
1 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
.travis.yml
View File

@ -11,25 +11,25 @@ matrix:
apt: apt:
sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test']
packages: ['clang'] packages: ['clang']
env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang34 addons: *clang34
env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Debug'
- os: linux - os: linux
compiler: clang compiler: clang
addons: &clang35 addons: &clang35
apt: apt:
sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test'] sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test']
packages: ['clang-3.5'] packages: ['clang-3.5']
env: COMPILER='clang++-3.5' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++-3.5' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang35 addons: *clang35
env: COMPILER='clang++-3.5' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++-3.5' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -38,12 +38,12 @@ matrix:
apt: apt:
sources: ['llvm-toolchain-precise-3.6', 'ubuntu-toolchain-r-test'] sources: ['llvm-toolchain-precise-3.6', 'ubuntu-toolchain-r-test']
packages: ['clang-3.6'] packages: ['clang-3.6']
env: COMPILER='clang++-3.6' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++-3.6' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang36 addons: *clang36
env: COMPILER='clang++-3.6' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++-3.6' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -52,12 +52,12 @@ matrix:
apt: apt:
sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test'] sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test']
packages: ['clang-3.7'] packages: ['clang-3.7']
env: COMPILER='clang++-3.7' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++-3.7' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang37 addons: *clang37
env: COMPILER='clang++-3.7' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++-3.7' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -66,12 +66,12 @@ matrix:
apt: apt:
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
packages: ['clang-3.8'] packages: ['clang-3.8']
env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++-3.8' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: clang compiler: clang
addons: *clang38 addons: *clang38
env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++-3.8' BUILD_TYPE='Debug'
# 2/ Linux GCC Builds # 2/ Linux GCC Builds
@ -81,12 +81,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.4'] packages: ['g++-4.4']
env: COMPILER='g++-4.4' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-4.4' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc44 addons: *gcc44
env: COMPILER='g++-4.4' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-4.4' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -95,12 +95,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.7'] packages: ['g++-4.7']
env: COMPILER='g++-4.7' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-4.7' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc47 addons: *gcc47
env: COMPILER='g++-4.7' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-4.7' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -109,12 +109,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.8'] packages: ['g++-4.8']
env: COMPILER='g++-4.8' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-4.8' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc48 addons: *gcc48
env: COMPILER='g++-4.8' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-4.8' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -123,12 +123,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9'] packages: ['g++-4.9']
env: COMPILER='g++-4.9' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-4.9' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc49 addons: *gcc49
env: COMPILER='g++-4.9' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-4.9' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -137,12 +137,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-5'] packages: ['g++-5']
env: COMPILER='g++-5' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-5' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc5 addons: *gcc5
env: COMPILER='g++-5' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-5' BUILD_TYPE='Debug'
- os: linux - os: linux
@ -151,17 +151,17 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-6'] packages: ['g++-6']
env: COMPILER='g++-6' BUILD_TYPE='Release' CPP11=0 env: COMPILER='g++-6' BUILD_TYPE='Release'
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: *gcc6 addons: *gcc6
env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='g++-6' BUILD_TYPE='Debug'
# 3a/ Linux C++11 GCC builds # 3a/ Linux C++11 GCC builds
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: &gcc48 addons: *gcc48
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.8'] packages: ['g++-4.8']
@ -175,10 +175,7 @@ matrix:
# 3b/ Linux C++11 Clang builds # 3b/ Linux C++11 Clang builds
- os: linux - os: linux
compiler: clang compiler: clang
addons: &clang38 addons: *clang38
apt:
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
packages: ['clang-3.8']
env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=1 env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=1
- os: linux - os: linux
@ -189,10 +186,7 @@ matrix:
# 4a/ Linux C++14 GCC builds # 4a/ Linux C++14 GCC builds
- os: linux - os: linux
compiler: gcc compiler: gcc
addons: &gcc6 addons: *gcc6
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-6']
env: COMPILER='g++-6' BUILD_TYPE='Release' CPP14=1 env: COMPILER='g++-6' BUILD_TYPE='Release' CPP14=1
- os: linux - os: linux
@ -203,10 +197,7 @@ matrix:
# 4b/ Linux C++14 Clang builds # 4b/ Linux C++14 Clang builds
- os: linux - os: linux
compiler: clang compiler: clang
addons: &clang38 addons: *clang38
apt:
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
packages: ['clang-3.8']
env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1 env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1
- os: linux - os: linux
@ -219,22 +210,22 @@ matrix:
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
compiler: clang compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Debug'
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
compiler: clang compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Release'
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
compiler: clang compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Debug'
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
compiler: clang compiler: clang
env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 env: COMPILER='clang++' BUILD_TYPE='Release'
install: install:
@ -246,7 +237,7 @@ install:
mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
export PATH=${DEPS_DIR}/cmake/bin:${PATH} export PATH=${DEPS_DIR}/cmake/bin:${PATH}
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
which cmake || brew install cmake which cmake || brew install cmake
fi fi
before_script: before_script: