From f4e6fccd46cd39a07ec7ef381f159bb8cb5e3938 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 11 Jul 2015 14:06:18 -0500 Subject: [PATCH] dockerize the Travis build Docker builds are *much* faster in Travis. Also, we prepare to enable C++11. --- .travis.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17e52dc..4180688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,20 @@ # http://about.travis-ci.org/docs/user/build-configuration/ # This file can be validated on: # http://lint.travis-ci.org/ +# See also +# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448 +# to allow C++11, though we are not yet building with -std=c++11 -#before_install: sudo apt-get install -y cmake -# cmake is pre-installed in Travis for both linux and osx - -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq valgrind +install: +- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 + - clang os: - linux language: cpp @@ -23,3 +30,4 @@ env: notifications: email: - aaronjjacobs@gmail.com +sudo: false