Skip to content

Commit e09f5fa

Browse files
authored
Merge pull request diffblue#2876 from tautschnig/no-travis-sudo
Travis: Use clang-6.0 and mark all builds as sudo: false
2 parents 1f487eb + 5f556da commit e09f5fa

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
@@ -143,71 +143,68 @@ jobs:
143143
- EXTRA_CXXFLAGS="-DDEBUG"
144144
script: echo "Not running any tests for a debug build."
145145

146-
# Ubuntu Linux with glibc using clang++-3.7, no-debug mode
146+
# Ubuntu Linux with glibc using clang++-6.0, no-debug mode
147147
- stage: Test different OS/CXX/Flags
148148
os: linux
149-
sudo: true
149+
sudo: false
150150
compiler: clang
151151
cache: ccache
152152
addons:
153153
apt:
154154
sources:
155155
- ubuntu-toolchain-r-test
156+
- llvm-toolchain-trusty-6.0
156157
packages:
157158
- libwww-perl
158159
- g++-5
160+
- clang-6.0
159161
- libstdc++-5-dev
160162
- libubsan0
161163
- parallel
162164
before_install:
163-
- curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -
164-
- echo "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.7 main" | sudo tee -a /etc/apt/sources.list > /dev/null
165-
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
166-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.7
167165
- mkdir bin
168166
- ln -s /usr/bin/gcc-5 bin/gcc
169167
- ln -s /usr/bin/c++-5 bin/g++
170168
- export CCACHE_CPP2=yes
171-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
169+
# env: COMPILER=clang++-6.0 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
172170
env:
173-
- COMPILER="ccache /usr/bin/clang++-3.7"
171+
- COMPILER="ccache /usr/bin/clang++-6.0"
174172
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DNDEBUG"
175173
- CCACHE_CPP2=yes
176174

177-
# Ubuntu Linux with glibc using clang++-3.7, debug mode, disable USE_DSTRING
175+
# Ubuntu Linux with glibc using clang++-6.0, debug mode, disable USE_DSTRING
178176
- stage: Test different OS/CXX/Flags
179177
os: linux
180-
sudo: true
178+
sudo: false
181179
compiler: clang
182180
cache: ccache
183181
addons:
184182
apt:
185183
sources:
186184
- ubuntu-toolchain-r-test
185+
- llvm-toolchain-trusty-6.0
187186
packages:
188187
- libwww-perl
189188
- g++-5
189+
- clang-6.0
190190
- libstdc++-5-dev
191191
- libubsan0
192192
before_install:
193-
- curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -
194-
- echo "deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.7 main" | sudo tee -a /etc/apt/sources.list > /dev/null
195-
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
196-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.7
197193
- mkdir bin
198194
- ln -s /usr/bin/gcc-5 bin/gcc
199195
- ln -s /usr/bin/g++-5 bin/g++
200196
- export CCACHE_CPP2=yes
201-
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
197+
# env: COMPILER=clang++-6.0 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
202198
env:
203-
- COMPILER="ccache /usr/bin/clang++-3.7"
199+
- COMPILER="ccache /usr/bin/clang++-6.0"
204200
- EXTRA_CXXFLAGS="-Qunused-arguments -fcolor-diagnostics -DDEBUG -DUSE_STD_STRING"
205201
- CCACHE_CPP2=yes
206202
script: echo "Not running any tests for a debug build."
207203

208204
# cmake build using g++-5
209205
- stage: Test different OS/CXX/Flags
210206
os: linux
207+
sudo: false
211208
compiler: gcc
212209
cache: ccache
213210
env:
@@ -233,6 +230,7 @@ jobs:
233230
# cmake build using g++-7
234231
- stage: Test different OS/CXX/Flags
235232
os: linux
233+
sudo: false
236234
compiler: gcc
237235
cache: ccache
238236
env:
@@ -258,6 +256,7 @@ jobs:
258256
# cmake build using clang++-6
259257
- stage: Test different OS/CXX/Flags
260258
os: linux
259+
sudo: false
261260
compiler: clang
262261
cache: ccache
263262
env:
@@ -291,6 +290,7 @@ jobs:
291290
# cmake build on OSX, using default clang
292291
- stage: Test different OS/CXX/Flags
293292
os: osx
293+
sudo: false
294294
compiler: clang
295295
cache: ccache
296296
before_install:

0 commit comments

Comments
 (0)