From 80d43896ff9e52c52297f9f0eeca4276f7fd6d19 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Thu, 7 Sep 2017 20:56:37 +0200 Subject: [PATCH] Reordered pip installs around --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d770ad8e..0e4d1a240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,8 +103,7 @@ install: if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then - jdk_switcher use openjdk7 && - sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant; + jdk_switcher use openjdk7; fi - if [ "$BUILD_TYPE" == "PSP" ]; then tar -x --xz -f sdk.lzma; @@ -114,15 +113,17 @@ install: export ANDROID_NDK=`pwd`/android-ndk-r9 && unzip 4e9e88c03f04.zip && rm -rf thirdparty/SDL2/* && - mv ewing-sdl_androidcmake-4e9e88c03f04/* thirdparty/SDL2/; + mv ewing-sdl_androidcmake-4e9e88c03f04/* thirdparty/SDL2/ && sudo pip install cpp-coveralls && sudo pip install pyjavaproperties && - sudo pip install github3.py; + sudo pip install github3.py && + sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" != "ANDROID" ]; then pip install cpp-coveralls && pip install pyjavaproperties && - pip install github3.py; + pip install github3.py && + sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant; fi env: