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

Travis: Wrap entire install script in travis_wait

Browse source 
Using travis_wait inside the install script doesn't
have the desired effect of increasing the timeout duration.
This commit is contained in:
Celtic Minstrel 2016-11-11 20:07:55 -05:00
parent 26ac2532a5
commit bc7c66d9f0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -48,7 +48,7 @@ before_install:
- if [[ "$OPT" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-deprecated-declarations -Wno-literal-suffix -Wno-deprecated-register"; fi
install:
- ./utils/travis/install_deps.sh
- travis_wait ./utils/travis/install_deps.sh
script:
- ./utils/travis/check_utf8.sh

11
utils/travis/install_deps.sh
View file

@ -4,13 +4,16 @@ if [ "$CXXSTD" == "1y" ]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
fi
travis_wait sudo apt-get update -qq
travis_wait sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libboost-thread-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libvorbis-dev gdb moreutils xvfb
sudo apt-get update -qq
sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libboost-thread-dev
sudo apt-get install -qq libcairo2-dev libfribidi-dev libpango1.0-dev
sudo apt-get install -qq libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libvorbis-dev
sudo apt-get install gdb moreutils xvfb
if [ "$USE_CMAKE" = true ]; then
travis_wait sudo apt-get install -qq cmake;
sudo apt-get install -qq cmake;
else
travis_wait sudo apt-get install -qq scons;
sudo apt-get install -qq scons;
fi
if [ "$CXXSTD" == "1y" ]; then