From 13173c034ed68e7bb73c15e2e0d060740dc8d15f Mon Sep 17 00:00:00 2001 From: arvidn Date: Sat, 8 Aug 2015 01:03:13 -0400 Subject: [PATCH] attempt to fix travis build --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dffc80f4..ac75e75ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ addons: - ppa:ubuntu-toolchain-r/test packages: - libboost1.55-all-dev + - boost-build - python2.7-dev - g++-4.8 @@ -36,7 +37,7 @@ before_install: install: - if [ $TRAVIS_OS_NAME == "osx" ]; then sudo brew install boost boost-build python27-dev; fi - - 'echo "using gcc-4.8 : : ccache g++ : -std=c++11 ;" > ~/user-config.jam' + - 'echo "using gcc : : ccache g++-4.8 : -std=c++11 ;" > ~/user-config.jam' - 'echo "using clang : : ccache clang++ : -std=c++11 ;" >> ~/user-config.jam' - 'echo "using python : 2.7 ;" >> ~/user-config.jam' - ccache -V && ccache --show-stats && ccache --zero-stats @@ -45,12 +46,12 @@ install: script: - cd test - - bjam -j 3 variant=$variant warnings=off -l900 $CC + - b2 -j 3 variant=$variant warnings=off -l900 $CC - cd ../examples - - bjam -j 3 variant=$variant warnings=off $CC + - b2 -j 3 variant=$variant warnings=off $CC - cd ../bindings/python - - bjam -j 3 variant=$variant warnings=off $CC stage_module + - b2 -j 3 variant=$variant warnings=off $CC stage_module - LD_LIBRARY_PATH=. python test.py - cd ../../simulation - - bjam -j 3 variant=$variant warnings=off $CC + - b2 -j 3 variant=$variant warnings=off $CC - ccache --show-stats