aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-10-30 19:23:16 +0100
committerShauren <shauren.trinity@gmail.com>2015-10-30 20:18:10 +0100
commit81488366c0d0c096644638c79b658f78d680ab78 (patch)
tree13b7fc68040b7bc0409499f6e5e8a302b47b8a81
parentb9e7b54637de22a53fd19158161db512b161f2ef (diff)
Travis: Upgrade clang to 3.5
(cherry picked from commit ba3c54323bc6a53539dbf4bfba9a50aa2c307d6f)
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index d5d18252296..b53d4031a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,13 @@ before_install:
- echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- echo "yes" | sudo add-apt-repository ppa:boost-latest/ppa
- echo "yes" | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+ - echo "yes" | sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main'
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
- sudo apt-get -qq update
- - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl
+ - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl clang-3.5
- sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-dev
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev libboost-regex1.55-dev
+ - export CC=clang-3.5 CXX=clang++-3.5
install:
- mysql -uroot -e 'create database test_mysql;'
@@ -23,6 +26,7 @@ install:
- sudo chmod +x contrib/check_updates.sh
script:
+ - $CXX --version
- mysql -uroot < sql/create/create_mysql.sql
- mysql -utrinity -ptrinity auth < sql/base/auth_database.sql
- ./contrib/check_updates.sh auth auth