Use sudo pip for Android and pip with linux without Android

This commit is contained in:
Xawotihs
2017-09-07 20:09:56 +02:00
committed by GitHub
parent 7eac02f8d4
commit e6af1a08b9

View File

@@ -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: