Update travis dist/tools

This commit is contained in:
Mike Ellery
2019-02-04 12:11:38 -08:00
committed by Nik Bougalis
parent 5c124f11c2
commit b2170d016a
2 changed files with 13 additions and 11 deletions

View File

@@ -1,5 +1,6 @@
sudo: false sudo: false
language: cpp language: cpp
dist: xenial
env: env:
global: global:
@@ -17,10 +18,12 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0 - llvm-toolchain-xenial-7
packages: packages:
- gcc-5 - gcc-7
- g++-5 - g++-7
- gcc-8
- g++-8
- python-software-properties - python-software-properties
- protobuf-compiler - protobuf-compiler
- libprotobuf-dev - libprotobuf-dev
@@ -29,17 +32,15 @@ addons:
- binutils-gold - binutils-gold
- cmake - cmake
- lcov - lcov
- llvm-5.0 - llvm-7
- clang-5.0 - clang-7
matrix: matrix:
include: include:
- compiler: gcc - compiler: gcc
env: GCC_VER=5 BUILD_TYPE=Debug env: GCC_VER=7 BUILD_TYPE=Debug
- compiler: clang - compiler: clang
env: GCC_VER=5 BUILD_TYPE=Debug env: GCC_VER=7 BUILD_TYPE=Debug
cache: cache:
directories: directories:

View File

@@ -24,8 +24,9 @@ then
tar xzf /tmp/boost.tar.gz tar xzf /tmp/boost.tar.gz
cd $BOOST_ROOT && \ cd $BOOST_ROOT && \
$time ./bootstrap.sh --prefix=$BOOST_ROOT && \ $time ./bootstrap.sh --prefix=$BOOST_ROOT && \
$time ./b2 -d1 define=_GLIBCXX_USE_CXX11_ABI=0 -j$((2*${NUM_PROCESSORS:-2})) &&\ $time ./b2 cxxflags="-std=c++14" -j$((2*${NUM_PROCESSORS:-2})) &&\
$time ./b2 -d0 define=_GLIBCXX_USE_CXX11_ABI=0 install $time ./b2 install
else else
echo "Using cached boost at $BOOST_ROOT" echo "Using cached boost at $BOOST_ROOT"
fi fi