From cd304dc800cb0be59896ed1cbcea5c8e24dc932a Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Mon, 10 Nov 2014 20:25:29 -0500 Subject: [PATCH 1/2] Make TravisCI builds use Clang 3.5 to match our Buildbot builds. --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46019885..b767cf09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,15 @@ compiler: - clang before_script: - sudo apt-get update -qq - - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev + - sudo apt-get install -y python-software-properties + - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/ppa + - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list + - echo "deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list + - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-get update -qq + - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev clang-3.5 - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh && cd $CHECKOUT_DIR script: - mkdir build && cd build - - python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota + - CC=clang-3.5 CXX=clang-3.5 python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota - ambuild \ No newline at end of file From f235f97d95ea70c24a3a1d856016614e84f5898b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sat, 21 Feb 2015 19:20:18 -0800 Subject: [PATCH 2/2] Install g++-4.8 before installing llvm 3.5 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index b767cf09..e0576367 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,10 @@ before_script: - sudo apt-get update -qq - sudo apt-get install -y python-software-properties - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/ppa + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get update -qq + - sudo apt-get install -qq g++-4.8 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list - echo "deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" | sudo tee --append /etc/apt/sources.list - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -