diff --git a/.travis.yml b/.travis.yml index 33d943c37..bae78dbca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false language: cpp +dist: xenial env: global: @@ -17,10 +18,12 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-xenial-7 packages: - - gcc-5 - - g++-5 + - gcc-7 + - g++-7 + - gcc-8 + - g++-8 - python-software-properties - protobuf-compiler - libprotobuf-dev @@ -29,17 +32,15 @@ addons: - binutils-gold - cmake - lcov - - llvm-5.0 - - clang-5.0 + - llvm-7 + - clang-7 matrix: include: - - compiler: gcc - env: GCC_VER=5 BUILD_TYPE=Debug - + env: GCC_VER=7 BUILD_TYPE=Debug - compiler: clang - env: GCC_VER=5 BUILD_TYPE=Debug + env: GCC_VER=7 BUILD_TYPE=Debug cache: directories: diff --git a/bin/sh/install-boost.sh b/bin/sh/install-boost.sh index cc6cc3e42..7dacd16d7 100644 --- a/bin/sh/install-boost.sh +++ b/bin/sh/install-boost.sh @@ -24,8 +24,9 @@ then tar xzf /tmp/boost.tar.gz cd $BOOST_ROOT && \ $time ./bootstrap.sh --prefix=$BOOST_ROOT && \ - $time ./b2 -d1 define=_GLIBCXX_USE_CXX11_ABI=0 -j$((2*${NUM_PROCESSORS:-2})) &&\ - $time ./b2 -d0 define=_GLIBCXX_USE_CXX11_ABI=0 install + $time ./b2 cxxflags="-std=c++14" -j$((2*${NUM_PROCESSORS:-2})) &&\ + $time ./b2 install + else echo "Using cached boost at $BOOST_ROOT" fi