Skip to content

Commit a04e2bf

Browse files
committed
Bump the newest Clang to 6.0 for the Travis CI build matrix.
1 parent 4353619 commit a04e2bf

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.travis.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,21 @@ matrix:
3232
env: BUILD_TYPE=Release GXX=4.8
3333

3434
# Newest/oldest clang
35-
# At the time of writing, clang-6.0 doesn't yet apt-get install properly
36-
# on Travis. Use 5.0 until the issue is fixed or a workaround is found.
3735
- os: linux
3836
compiler: clang
3937
addons:
4038
apt:
41-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0' ]
42-
packages: [ 'clang-5.0', 'libstdc++-7-dev', 'libstdc++6' ] # C++17 support in libstd++
43-
env: BUILD_TYPE=MinSizeRel CLANGXX=5.0 CXX_STD=17
39+
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0' ]
40+
packages: [ 'clang-6.0', 'libstdc++-7-dev', 'libstdc++6' ] # C++17 support in libstd++
41+
env: BUILD_TYPE=MinSizeRel CLANGXX=6.0 CXX_STD=17
4442

4543
- os: linux
4644
compiler: clang
4745
addons:
4846
apt:
49-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0' ]
50-
packages: [ 'clang-5.0', 'libstdc++-7-dev', 'libstdc++6' ] # C++17 support in libstd++
51-
env: BUILD_TYPE=Release CLANGXX=5.0 CXX_STD=17
47+
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0' ]
48+
packages: [ 'clang-6.0', 'libstdc++-7-dev', 'libstdc++6' ] # C++17 support in libstd++
49+
env: BUILD_TYPE=Release CLANGXX=6.0 CXX_STD=17
5250

5351
- os: linux
5452
compiler: clang
@@ -105,15 +103,15 @@ matrix:
105103
apt:
106104
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0' ]
107105
packages: [ 'clang-5.0' ]
108-
env: BUILD_TYPE=Debug CLANGXX=5.0
106+
env: BUILD_TYPE=Release CLANGXX=5.0
109107

110108
- os: linux
111109
compiler: clang
112110
addons:
113111
apt:
114112
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0' ]
115113
packages: [ 'clang-4.0' ]
116-
env: BUILD_TYPE=Release CLANGXX=4.0
114+
env: BUILD_TYPE=MinSizeRel CLANGXX=4.0
117115

118116
- os: linux
119117
compiler: clang

0 commit comments

Comments
 (0)