Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reordered pip installs around

Browse Source
This commit is contained in:
Xawotihs
2017-09-07 20:56:37 +02:00
committed by GitHub
parent 1c5949411f
commit 80d43896ff
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -103,8 +103,7 @@ install:
if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
fi fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
jdk_switcher use openjdk7 && 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;
fi fi
- if [ "$BUILD_TYPE" == "PSP" ]; then - if [ "$BUILD_TYPE" == "PSP" ]; then
tar -x --xz -f sdk.lzma; tar -x --xz -f sdk.lzma;
@@ -114,15 +113,17 @@ install:
export ANDROID_NDK=`pwd`/android-ndk-r9 && export ANDROID_NDK=`pwd`/android-ndk-r9 &&
unzip 4e9e88c03f04.zip && unzip 4e9e88c03f04.zip &&
rm -rf thirdparty/SDL2/* && 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 cpp-coveralls &&
sudo pip install pyjavaproperties && 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 fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" != "ANDROID" ]; then - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" != "ANDROID" ]; then
pip install cpp-coveralls && pip install cpp-coveralls &&
pip install pyjavaproperties && 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 fi
env: env: