Skip to content

Commit 65cdd61

Browse files
committed
Travis: Use clang-6.0 and mark all builds as sudo: false
This effectively reverts 93bc946 and instead switches the clang-3.7 builds to clang-6.0
1 parent eabae14 commit 65cdd61

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

.travis.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,71 +146,68 @@ 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++-6.0, no-debug mode
150150
- stage: Test different OS/CXX/Flags
151151
os: linux
152-
sudo: true
152+
sudo: false
153153
compiler: clang
154154
cache: ccache
155155
addons:
156156
apt:
157157
sources:
158158
- ubuntu-toolchain-r-test
159+
- llvm-toolchain-trusty-6.0
159160
packages:
160161
- libwww-perl
161162
- g++-5
163+
- clang-6.0
162164
- libstdc++-5-dev
163165
- libubsan0
164166
- parallel
165167
before_install:
166-
- curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -
167-
- echo "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.7 main" | sudo tee -a /etc/apt/sources.list > /dev/null
168-
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
169-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.7
170168
- mkdir bin
171169
- ln -s /usr/bin/gcc-5 bin/gcc
172170
- ln -s /usr/bin/c++-5 bin/g++
173171
- export CCACHE_CPP2=yes
174-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
172+
# env: COMPILER=clang++-6.0 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
175173
env:
176-
- COMPILER="ccache /usr/bin/clang++-3.7"
174+
- COMPILER="ccache /usr/bin/clang++-6.0"
177175
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DNDEBUG"
178176
- CCACHE_CPP2=yes
179177

180-
# Ubuntu Linux with glibc using clang++-3.7, debug mode, disable USE_DSTRING
178+
# Ubuntu Linux with glibc using clang++-6.0, debug mode, disable USE_DSTRING
181179
- stage: Test different OS/CXX/Flags
182180
os: linux
183-
sudo: true
181+
sudo: false
184182
compiler: clang
185183
cache: ccache
186184
addons:
187185
apt:
188186
sources:
189187
- ubuntu-toolchain-r-test
188+
- llvm-toolchain-trusty-6.0
190189
packages:
191190
- libwww-perl
192191
- g++-5
192+
- clang-6.0
193193
- libstdc++-5-dev
194194
- libubsan0
195195
before_install:
196-
- curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -
197-
- echo "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.7 main" | sudo tee -a /etc/apt/sources.list > /dev/null
198-
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
199-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.7
200196
- mkdir bin
201197
- ln -s /usr/bin/gcc-5 bin/gcc
202198
- ln -s /usr/bin/g++-5 bin/g++
203199
- export CCACHE_CPP2=yes
204-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
200+
# env: COMPILER=clang++-6.0 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
205201
env:
206-
- COMPILER="ccache /usr/bin/clang++-3.7"
202+
- COMPILER="ccache /usr/bin/clang++-6.0"
207203
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DDEBUG -DUSE_STD_STRING"
208204
- CCACHE_CPP2=yes
209205
script: echo "Not running any tests for a debug build."
210206

211207
# cmake build using g++-5
212208
- stage: Test different OS/CXX/Flags
213209
os: linux
210+
sudo: false
214211
compiler: gcc
215212
cache: ccache
216213
env:
@@ -236,6 +233,7 @@ jobs:
236233
# cmake build using g++-7
237234
- stage: Test different OS/CXX/Flags
238235
os: linux
236+
sudo: false
239237
compiler: gcc
240238
cache: ccache
241239
env:
@@ -261,6 +259,7 @@ jobs:
261259
# cmake build using clang++-6
262260
- stage: Test different OS/CXX/Flags
263261
os: linux
262+
sudo: false
264263
compiler: clang
265264
cache: ccache
266265
env:
@@ -294,6 +293,7 @@ jobs:
294293
# cmake build on OSX, using default clang
295294
- stage: Test different OS/CXX/Flags
296295
os: osx
296+
sudo: false
297297
compiler: clang
298298
cache: ccache
299299
before_install:

0 commit comments

Comments
 (0)