Skip to content

Commit 55408b2

Browse files
authored
Workaround LLVM's feeble APT mirror being down. (google#1251)
1 parent ceb1244 commit 55408b2

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ addons:
1313
apt:
1414
sources: &common_sources
1515
- ubuntu-toolchain-r-test
16-
- llvm-toolchain-precise-3.6
1716
- kalakris-cmake
1817
packages: &common_packages
1918
- autoconf
@@ -31,31 +30,28 @@ matrix:
3130
env: SSL=openssl
3231
- compiler: clang
3332
os: linux
34-
env: SSL=boringssl REAL_CC=clang-3.6 REAL_CXX=clang++-3.6
33+
env: SSL=boringssl LLVM=3.6.2
3534
addons:
3635
apt:
3736
sources: *common_sources
3837
packages:
3938
- *common_packages
40-
- clang-3.6
4139
- compiler: clang
4240
os: linux
43-
env: SSL=openssl REAL_CC=clang-3.6 REAL_CXX=clang++-3.6
41+
env: SSL=openssl LLVM=3.6.2
4442
addons:
4543
apt:
4644
sources: *common_sources
4745
packages:
4846
- *common_packages
49-
- clang-3.6
5047
- compiler: clang
5148
os: linux
52-
env: SSL=openssl REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 SANITIZE="-fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1" LSAN_OPTIONS="suppressions=${HOME}/lsan.supp"
49+
env: SSL=openssl LLVM=3.6.2 SANITIZE="-fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1" LSAN_OPTIONS="suppressions=${HOME}/lsan.supp"
5350
addons:
5451
apt:
5552
sources: *common_sources
5653
packages:
5754
- *common_packages
58-
- clang-3.6
5955
exclude:
6056
- compiler: gcc
6157
os: linux
@@ -95,6 +91,13 @@ before_install:
9591
- echo "protoc.bin = ${PROTOC}" >> local.properties
9692

9793
install:
94+
# Workaround LLVM's apt mirror being feeble and underpowered
95+
- |
96+
if [ "$LLVM" != "" ]; then
97+
CLANG_URL="http://llvm.org/releases/${LLVM}/clang+llvm-${LLVM}-x86_64-linux-gnu-ubuntu-14.04.tar.xz"
98+
mkdir /tmp/clang && travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xJ -C /tmp/clang
99+
export PATH="/tmp/clang/bin:${PATH}"
100+
fi
98101
- autoconf --version
99102
- pushd ..
100103
- mkdir -p ct

0 commit comments

Comments
 (0)