0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

travis: get g++ from the same repo where we get boost

Browse source
This commit is contained in:
Chris Beck 2014-10-26 16:51:51 -04:00
parent bcb89aa0c7
commit c5dd249072
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -7,12 +7,10 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libsdl-mixer1.2-dev libboost-locale-dev
- sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- sudo add-apt-repository -y --remove "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"
- if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test ; fi
- sudo apt-get update -qq
- if [ "$CXX" = "g++" ]; then sudo apt-get -qq install g++-4.8; fi
- if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test ; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
- sudo add-apt-repository -y --remove "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"
- sudo apt-get update -qq
install:
script: scons cxxtool=$CXX strict=True extra_flags_release="-O0" wesnoth wesnothd campaignd test
after_script: