Skip to content

Commit

Permalink
We now use trusty (not precise), and may as well bump clang to v5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed Dec 14, 2017
1 parent 443e361 commit 669d149
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ addons:
postgresql: '9.4'
apt:
sources:
- couchbase-precise
- llvm-toolchain-precise-3.9
- couchbase-trusty
- llvm-toolchain-trusty-5.0
# For newer libkqueue
- sourceline: ppa:rjvbertin/misc
packages:
- autoconf
- build-essential
- clang-3.9
- clang-5.0
- debhelper
- devscripts
- dh-make
Expand Down Expand Up @@ -96,7 +96,7 @@ addons:
- libykclient-dev
- libyubikey-dev
# Needed for llvm-symbolizer
- llvm-3.9
- llvm-5.0
# For rendering clang scan results
- lynx
- slapd
Expand All @@ -108,8 +108,8 @@ services:
before_install:
- rvm --install --default --binary use 2.4
- if [ "${CC}" == 'gcc' ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 && sudo update-alternatives --config gcc; fi
- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.9 60 && sudo update-alternatives --config clang; fi
- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.9 60 && sudo update-alternatives --config llvm-symbolizer; fi
- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-5.0 60 && sudo update-alternatives --config clang; fi
- if [ "${CC}" == 'clang' ]; then sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-5.0 60 && sudo update-alternatives --config llvm-symbolizer; fi
- $CC --version
before_script:
- ./scripts/travis/build.sh
Expand Down

0 comments on commit 669d149

Please sign in to comment.