From a49af4648cea521e10a047c694cc159f26a9667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 20 Apr 2017 22:50:07 +0200 Subject: [PATCH] Minor .travis.yml cleanup Still could use someone more experienced to clean it up properly... --- .travis.yml | 73 +++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32ef4aa..77387ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,25 +11,25 @@ matrix: apt: sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] packages: ['clang'] - env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++' BUILD_TYPE='Release' - os: linux compiler: clang addons: *clang34 - env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 - + env: COMPILER='clang++' BUILD_TYPE='Debug' + - os: linux compiler: clang addons: &clang35 apt: sources: ['llvm-toolchain-precise-3.5', 'ubuntu-toolchain-r-test'] packages: ['clang-3.5'] - env: COMPILER='clang++-3.5' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++-3.5' BUILD_TYPE='Release' - os: linux compiler: clang addons: *clang35 - env: COMPILER='clang++-3.5' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++-3.5' BUILD_TYPE='Debug' - os: linux @@ -38,12 +38,12 @@ matrix: apt: sources: ['llvm-toolchain-precise-3.6', 'ubuntu-toolchain-r-test'] packages: ['clang-3.6'] - env: COMPILER='clang++-3.6' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++-3.6' BUILD_TYPE='Release' - os: linux compiler: clang addons: *clang36 - env: COMPILER='clang++-3.6' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++-3.6' BUILD_TYPE='Debug' - os: linux @@ -52,12 +52,12 @@ matrix: apt: sources: ['llvm-toolchain-precise-3.7', 'ubuntu-toolchain-r-test'] packages: ['clang-3.7'] - env: COMPILER='clang++-3.7' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++-3.7' BUILD_TYPE='Release' - os: linux compiler: clang addons: *clang37 - env: COMPILER='clang++-3.7' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++-3.7' BUILD_TYPE='Debug' - os: linux @@ -66,12 +66,12 @@ matrix: apt: sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] packages: ['clang-3.8'] - env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++-3.8' BUILD_TYPE='Release' - os: linux compiler: clang addons: *clang38 - env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' # 2/ Linux GCC Builds @@ -81,12 +81,12 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.4'] - env: COMPILER='g++-4.4' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-4.4' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc44 - env: COMPILER='g++-4.4' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-4.4' BUILD_TYPE='Debug' - os: linux @@ -95,12 +95,12 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.7'] - env: COMPILER='g++-4.7' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-4.7' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc47 - env: COMPILER='g++-4.7' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-4.7' BUILD_TYPE='Debug' - os: linux @@ -109,12 +109,12 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.8'] - env: COMPILER='g++-4.8' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-4.8' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc48 - env: COMPILER='g++-4.8' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-4.8' BUILD_TYPE='Debug' - os: linux @@ -123,12 +123,12 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.9'] - env: COMPILER='g++-4.9' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-4.9' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc49 - env: COMPILER='g++-4.9' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-4.9' BUILD_TYPE='Debug' - os: linux @@ -137,12 +137,12 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-5'] - env: COMPILER='g++-5' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-5' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc5 - env: COMPILER='g++-5' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-5' BUILD_TYPE='Debug' - os: linux @@ -151,17 +151,17 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-6'] - env: COMPILER='g++-6' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='g++-6' BUILD_TYPE='Release' - os: linux compiler: gcc addons: *gcc6 - env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='g++-6' BUILD_TYPE='Debug' # 3a/ Linux C++11 GCC builds - os: linux compiler: gcc - addons: &gcc48 + addons: *gcc48 apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.8'] @@ -175,10 +175,7 @@ matrix: # 3b/ Linux C++11 Clang builds - os: linux compiler: clang - addons: &clang38 - apt: - sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] - packages: ['clang-3.8'] + addons: *clang38 env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP11=1 - os: linux @@ -189,10 +186,7 @@ matrix: # 4a/ Linux C++14 GCC builds - os: linux compiler: gcc - addons: &gcc6 - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6'] + addons: *gcc6 env: COMPILER='g++-6' BUILD_TYPE='Release' CPP14=1 - os: linux @@ -203,10 +197,7 @@ matrix: # 4b/ Linux C++14 Clang builds - os: linux compiler: clang - addons: &clang38 - apt: - sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] - packages: ['clang-3.8'] + addons: *clang38 env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1 - os: linux @@ -219,22 +210,22 @@ matrix: - os: osx osx_image: xcode7.3 compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++' BUILD_TYPE='Debug' - os: osx osx_image: xcode7.3 compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++' BUILD_TYPE='Release' - os: osx osx_image: xcode8 compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Debug' CPP11=0 + env: COMPILER='clang++' BUILD_TYPE='Debug' - os: osx osx_image: xcode8 compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Release' CPP11=0 + env: COMPILER='clang++' BUILD_TYPE='Release' 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 export PATH=${DEPS_DIR}/cmake/bin:${PATH} elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - which cmake || brew install cmake + which cmake || brew install cmake fi before_script: