Skip to content

Commit 93bc946

Browse files
author
Owen Jones
committed
Use sudo build and manually install clang-3.7
Travis have removed llvm-toolchain-precise-3.7 from their whitelist of sources for the "apt:" option, so we have to use a sudo build and add it as a source ourselves.
1 parent b0a0002 commit 93bc946

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.travis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,24 @@ jobs:
149149
# Ubuntu Linux with glibc using clang++-3.7, no-debug mode
150150
- stage: Test different OS/CXX/Flags
151151
os: linux
152-
sudo: false
152+
sudo: true
153153
compiler: clang
154154
cache: ccache
155155
addons:
156156
apt:
157157
sources:
158158
- ubuntu-toolchain-r-test
159-
- llvm-toolchain-precise-3.7
160159
packages:
161160
- libwww-perl
162-
- clang-3.7
163161
- g++-5
164162
- libstdc++-5-dev
165163
- libubsan0
166164
- parallel
167165
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
168170
- mkdir bin
169171
- ln -s /usr/bin/gcc-5 bin/gcc
170172
- ln -s /usr/bin/c++-5 bin/g++
@@ -178,21 +180,23 @@ jobs:
178180
# Ubuntu Linux with glibc using clang++-3.7, debug mode, disable USE_DSTRING
179181
- stage: Test different OS/CXX/Flags
180182
os: linux
181-
sudo: false
183+
sudo: true
182184
compiler: clang
183185
cache: ccache
184186
addons:
185187
apt:
186188
sources:
187189
- ubuntu-toolchain-r-test
188-
- llvm-toolchain-precise-3.7
189190
packages:
190191
- libwww-perl
191-
- clang-3.7
192192
- g++-5
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
196200
- mkdir bin
197201
- ln -s /usr/bin/gcc-5 bin/gcc
198202
- ln -s /usr/bin/g++-5 bin/g++

0 commit comments

Comments
 (0)