Skip to content

Commit 07cc79f

Browse files
author
Daniel Kroening
committed
switch two Travis jobs to clang 6
1 parent b0a0002 commit 07cc79f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
- EXTRA_CXXFLAGS="-DDEBUG"
147147
script: echo "Not running any tests for a debug build."
148148

149-
# Ubuntu Linux with glibc using clang++-3.7, no-debug mode
149+
# Ubuntu Linux with glibc using clang++, no-debug mode
150150
- stage: Test different OS/CXX/Flags
151151
os: linux
152152
sudo: false
@@ -156,10 +156,10 @@ jobs:
156156
apt:
157157
sources:
158158
- ubuntu-toolchain-r-test
159-
- llvm-toolchain-precise-3.7
159+
- llvm-toolchain-trusty-6.0
160160
packages:
161161
- libwww-perl
162-
- clang-3.7
162+
- clang-6.0
163163
- g++-5
164164
- libstdc++-5-dev
165165
- libubsan0
@@ -169,13 +169,13 @@ jobs:
169169
- ln -s /usr/bin/gcc-5 bin/gcc
170170
- ln -s /usr/bin/c++-5 bin/g++
171171
- export CCACHE_CPP2=yes
172-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
172+
# env: COMPILER=clang++ SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
173173
env:
174-
- COMPILER="ccache /usr/bin/clang++-3.7"
174+
- COMPILER="ccache /usr/bin/clang++"
175175
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DNDEBUG"
176176
- CCACHE_CPP2=yes
177177

178-
# Ubuntu Linux with glibc using clang++-3.7, debug mode, disable USE_DSTRING
178+
# Ubuntu Linux with glibc using clang++, debug mode, disable USE_DSTRING
179179
- stage: Test different OS/CXX/Flags
180180
os: linux
181181
sudo: false
@@ -185,10 +185,10 @@ jobs:
185185
apt:
186186
sources:
187187
- ubuntu-toolchain-r-test
188-
- llvm-toolchain-precise-3.7
188+
- llvm-toolchain-trusty-6.0
189189
packages:
190190
- libwww-perl
191-
- clang-3.7
191+
- clang-6.0
192192
- g++-5
193193
- libstdc++-5-dev
194194
- libubsan0
@@ -197,9 +197,9 @@ jobs:
197197
- ln -s /usr/bin/gcc-5 bin/gcc
198198
- ln -s /usr/bin/g++-5 bin/g++
199199
- export CCACHE_CPP2=yes
200-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
200+
# env: COMPILER=clang++ SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
201201
env:
202-
- COMPILER="ccache /usr/bin/clang++-3.7"
202+
- COMPILER="ccache /usr/bin/clang++"
203203
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DDEBUG -DUSE_STD_STRING"
204204
- CCACHE_CPP2=yes
205205
script: echo "Not running any tests for a debug build."

0 commit comments

Comments
 (0)