Reduce the number of travis configurations.

Hopefully this will make it run faster.
This commit is contained in:
Jacob Dufault 2017-12-18 16:57:31 -08:00
parent 1fd50b4dea
commit 9b9740f421

View File

@ -38,12 +38,12 @@ matrix:
packages: ["g++-5"] packages: ["g++-5"]
sources: *apt_sources sources: *apt_sources
- env: COMPILER=g++-6 # - env: COMPILER=g++-6
compiler: gcc # compiler: gcc
addons: &gcc6 # addons: &gcc6
apt: # apt:
packages: ["g++-6"] # packages: ["g++-6"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=g++-7 - env: COMPILER=g++-7
compiler: gcc compiler: gcc
@ -58,35 +58,35 @@ matrix:
packages: ["clang-3.5", "g++-7"] packages: ["clang-3.5", "g++-7"]
sources: *apt_sources sources: *apt_sources
- env: COMPILER=clang++-3.6 # - env: COMPILER=clang++-3.6
addons: &clang36 # addons: &clang36
apt: # apt:
packages: ["clang-3.6", "g++-7"] # packages: ["clang-3.6", "g++-7"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=clang++-3.7 # - env: COMPILER=clang++-3.7
addons: &clang37 # addons: &clang37
apt: # apt:
packages: ["clang-3.7", "g++-7"] # packages: ["clang-3.7", "g++-7"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=clang++-3.8 # - env: COMPILER=clang++-3.8
addons: &clang38 # addons: &clang38
apt: # apt:
packages: ["clang-3.8", "g++-7"] # packages: ["clang-3.8", "g++-7"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=clang++-3.9 # - env: COMPILER=clang++-3.9
addons: &clang39 # addons: &clang39
apt: # apt:
packages: ["clang-3.9", "g++-7"] # packages: ["clang-3.9", "g++-7"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=clang++-4.0 # - env: COMPILER=clang++-4.0
addons: &clang40 # addons: &clang40
apt: # apt:
packages: ["clang-4.0", "g++-7"] # packages: ["clang-4.0", "g++-7"]
sources: *apt_sources # sources: *apt_sources
- env: COMPILER=clang++-5.0 - env: COMPILER=clang++-5.0
addons: &clang50 addons: &clang50
@ -98,29 +98,29 @@ matrix:
osx_image: xcode6.4 osx_image: xcode6.4
os: osx os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode7.3 # osx_image: xcode7.3
os: osx # os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode8 # osx_image: xcode8
os: osx # os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode8.1 # osx_image: xcode8.1
os: osx # os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode8.2 # osx_image: xcode8.2
os: osx # os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode8.3 # osx_image: xcode8.3
os: osx # os: osx
- env: COMPILER=clang++ # - env: COMPILER=clang++
osx_image: xcode9 # osx_image: xcode9
os: osx # os: osx
- env: COMPILER=clang++ - env: COMPILER=clang++
osx_image: xcode9.1 osx_image: xcode9.1
@ -131,10 +131,10 @@ matrix:
osx_image: xcode9.1 osx_image: xcode9.1
os: osx os: osx
- env: COMPILER=g++-6 # - env: COMPILER=g++-6
compiler: gcc # compiler: gcc
osx_image: xcode9.1 # osx_image: xcode9.1
os: osx # os: osx
- env: COMPILER=g++-7 - env: COMPILER=g++-7
compiler: gcc compiler: gcc