diff --git a/.travis.yml b/.travis.yml index 10c5aef2a..56432f266 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,9 +102,8 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then + - if [ "$TRAVIS_OS_NAME" == "linux"]; then jdk_switcher use openjdk7 && - pip install cpp-coveralls && 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 [ "$BUILD_TYPE" == "PSP" ]; then @@ -116,9 +115,15 @@ install: unzip 4e9e88c03f04.zip && rm -rf thirdparty/SDL2/* && mv ewing-sdl_androidcmake-4e9e88c03f04/* thirdparty/SDL2/; + sudo pip install cpp-coveralls && + sudo pip install pyjavaproperties && + sudo pip install github3.py && + fi + - if [ "$TRAVIS_OS_NAME" == "linux"] && [ "$BUILD_TYPE" != "ANDROID" ]; then + pip install cpp-coveralls && + pip install pyjavaproperties && + pip install github3.py && fi - - pip install pyjavaproperties - - pip install github3.py env: global: