another attempt to fix travis

This commit is contained in:
arvidn 2015-08-08 01:10:36 -04:00
parent 13173c034e
commit ce1d38704d
1 changed files with 3 additions and 6 deletions

View File

@ -25,24 +25,20 @@ addons:
apt: apt:
sources: sources:
- boost-latest - boost-latest
- ppa:ubuntu-toolchain-r/test
packages: packages:
- libboost1.55-all-dev - libboost1.55-all-dev
- boost-build
- python2.7-dev - python2.7-dev
- g++-4.8
before_install: before_install:
- git submodule update --init --recursive - git submodule update --init --recursive
install: install:
- if [ $TRAVIS_OS_NAME == "osx" ]; then sudo brew install boost boost-build python27-dev; fi
- 'echo "using gcc : : ccache g++-4.8 : <cxxflags>-std=c++11 ;" > ~/user-config.jam' - 'echo "using gcc : : ccache g++-4.8 : <cxxflags>-std=c++11 ;" > ~/user-config.jam'
- 'echo "using clang : : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam' - 'echo "using clang : : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
- 'echo "using python : 2.7 ;" >> ~/user-config.jam' - 'echo "using python : 2.7 ;" >> ~/user-config.jam'
- ccache -V && ccache --show-stats && ccache --zero-stats - ccache -V && ccache --show-stats && ccache --zero-stats
- which $CXX - which $CXX-4.8
- ls -la `which $CXX` - ls -la `which $CXX-4.8`
script: script:
- cd test - cd test
@ -55,3 +51,4 @@ script:
- cd ../../simulation - cd ../../simulation
- b2 -j 3 variant=$variant warnings=off $CC - b2 -j 3 variant=$variant warnings=off $CC
- ccache --show-stats - ccache --show-stats