TravisCI: remove redundant setting of CXX variable

This commit is contained in:
Roelf-Jilling 2020-01-10 21:35:43 +01:00
parent 888b9b9723
commit cdedae897c

View File

@ -23,33 +23,29 @@ matrix:
########################################################################## ##########################################################################
# XCode 8.3 # XCode 8.3
- env: COMPILER=clang++ BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: BUILD_TYPE=Debug GSL_CXX_STANDARD=14
os: osx os: osx
osx_image: xcode8.3 osx_image: xcode8.3
compiler: clang
- env: COMPILER=clang++ BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: BUILD_TYPE=Release GSL_CXX_STANDARD=14
os: osx os: osx
osx_image: xcode8.3 osx_image: xcode8.3
compiler: clang
# XCode 9.1 # XCode 9.1
- env: COMPILER=clang++ BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: BUILD_TYPE=Debug GSL_CXX_STANDARD=14
os: osx os: osx
osx_image: xcode9.1 osx_image: xcode9.1
compiler: clang
- env: COMPILER=clang++ BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: BUILD_TYPE=Release GSL_CXX_STANDARD=14
os: osx os: osx
osx_image: xcode9.1 osx_image: xcode9.1
compiler: clang
########################################################################## ##########################################################################
# Clang on Linux # Clang on Linux
########################################################################## ##########################################################################
# Clang 3.6 # Clang 3.6
- env: COMPILER=clang++-3.6 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-3.6 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang36 addons: &clang36
apt: apt:
packages: packages:
@ -59,11 +55,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- env: COMPILER=clang++-3.6 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-3.6 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang36 addons: *clang36
# Clang 3.7 # Clang 3.7
- env: COMPILER=clang++-3.7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-3.7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang37 addons: &clang37
apt: apt:
packages: packages:
@ -73,11 +69,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.7
- env: COMPILER=clang++-3.7 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-3.7 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang37 addons: *clang37
# Clang 3.8 # Clang 3.8
- env: COMPILER=clang++-3.8 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-3.8 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang38 addons: &clang38
apt: apt:
packages: packages:
@ -87,11 +83,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- env: COMPILER=clang++-3.8 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-3.8 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang38 addons: *clang38
# Clang 3.9 # Clang 3.9
- env: COMPILER=clang++-3.9 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-3.9 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang39 addons: &clang39
apt: apt:
packages: packages:
@ -101,11 +97,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-precise-3.9
- env: COMPILER=clang++-3.9 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-3.9 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang39 addons: *clang39
# Clang 4.0 # Clang 4.0
- env: COMPILER=clang++-4.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-4.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang40 addons: &clang40
apt: apt:
packages: packages:
@ -115,11 +111,11 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-4.0
- env: COMPILER=clang++-4.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-4.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang40 addons: *clang40
# Clang 5.0 # Clang 5.0
- env: COMPILER=clang++-5.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-5.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang50 addons: &clang50
apt: apt:
packages: packages:
@ -131,17 +127,17 @@ matrix:
- sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main' - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- env: COMPILER=clang++-5.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-5.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang50 addons: *clang50
- env: COMPILER=clang++-5.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=17 - env: CXX=clang++-5.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=17
addons: *clang50 addons: *clang50
- env: COMPILER=clang++-5.0 BUILD_TYPE=Release GSL_CXX_STANDARD=17 - env: CXX=clang++-5.0 BUILD_TYPE=Release GSL_CXX_STANDARD=17
addons: *clang50 addons: *clang50
# Clang 6.0 # Clang 6.0
- env: COMPILER=clang++-6.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-6.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang60 addons: &clang60
apt: apt:
packages: packages:
@ -153,18 +149,18 @@ matrix:
- sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main' - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- env: COMPILER=clang++-6.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-6.0 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang60 addons: *clang60
# Clang 6.0 c++17 # Clang 6.0 c++17
- env: COMPILER=clang++-6.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=17 - env: CXX=clang++-6.0 BUILD_TYPE=Debug GSL_CXX_STANDARD=17
addons: *clang60 addons: *clang60
- env: COMPILER=clang++-6.0 BUILD_TYPE=Release GSL_CXX_STANDARD=17 - env: CXX=clang++-6.0 BUILD_TYPE=Release GSL_CXX_STANDARD=17
addons: *clang60 addons: *clang60
# Clang 7.0 # Clang 7.0
- env: COMPILER=clang++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=clang++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &clang70 addons: &clang70
apt: apt:
packages: packages:
@ -175,14 +171,14 @@ matrix:
- llvm-toolchain-trusty-7 - llvm-toolchain-trusty-7
- env: COMPILER=clang++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=clang++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *clang70 addons: *clang70
# Clang 7.0 c++17 # Clang 7.0 c++17
- env: COMPILER=clang++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=17 - env: CXX=clang++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=17
addons: *clang70 addons: *clang70
- env: COMPILER=clang++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=17 - env: CXX=clang++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=17
addons: *clang70 addons: *clang70
########################################################################## ##########################################################################
@ -190,48 +186,46 @@ matrix:
########################################################################## ##########################################################################
# GCC 5 # GCC 5
- env: COMPILER=g++-5 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=g++-5 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &gcc5 addons: &gcc5
apt: apt:
packages: g++-5 packages: g++-5
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- env: COMPILER=g++-5 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=g++-5 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *gcc5 addons: *gcc5
# GCC 6 # GCC 6
- env: COMPILER=g++-6 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=g++-6 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &gcc6 addons: &gcc6
apt: apt:
packages: g++-6 packages: g++-6
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- env: COMPILER=g++-6 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=g++-6 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *gcc6 addons: *gcc6
# GCC 7 # GCC 7
- env: COMPILER=g++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14 - env: CXX=g++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=14
addons: &gcc7 addons: &gcc7
apt: apt:
packages: g++-7 packages: g++-7
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- env: COMPILER=g++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=14 - env: CXX=g++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=14
addons: *gcc7 addons: *gcc7
# GCC 7 c++17 # GCC 7 c++17
- env: COMPILER=g++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=17 - env: CXX=g++-7 BUILD_TYPE=Debug GSL_CXX_STANDARD=17
addons: *gcc7 addons: *gcc7
- env: COMPILER=g++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=17 - env: CXX=g++-7 BUILD_TYPE=Release GSL_CXX_STANDARD=17
addons: *gcc7 addons: *gcc7
install: install:
# Set the ${CXX} variable properly
- export CXX=${COMPILER}
- ${CXX} --version - ${CXX} --version
# Dependencies required by the CI are installed in ${TRAVIS_BUILD_DIR}/deps/ # Dependencies required by the CI are installed in ${TRAVIS_BUILD_DIR}/deps/