travis-ci: update OSX CI build to work again

This commit is contained in:
Hans-Christoph Steiner 2017-09-19 19:58:31 +02:00
parent d1f6126dea
commit 0a88a97881

View file

@ -12,8 +12,9 @@ matrix:
# this doesn't actually work yet https://github.com/travis-ci/travis-ci/issues/5337 # this doesn't actually work yet https://github.com/travis-ci/travis-ci/issues/5337
dist: trusty dist: trusty
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode9
env: ANDROID_HOME=/usr/local/opt/android-sdk env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
env: ANDROID_HOME=/usr/local/share/android-sdk
licenses: licenses:
- 'android-sdk-preview-license-52d11cd2' - 'android-sdk-preview-license-52d11cd2'
@ -24,21 +25,32 @@ licenses:
install: install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update > /dev/null; brew update > /dev/null;
brew install android-sdk dash gnu-sed jpeg python3; brew install dash bash python3 gradle;
sudo pip3 install pep8 pyflakes pylint; brew install gnu-sed --with-default-names;
brew cask install android-sdk;
mkdir -p "$ANDROID_HOME/licenses";
echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license";
echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license";
echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools";
echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;25.0.2";
echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23";
sudo pip3 install -e .; sudo pip3 install -e .;
sudo rm -rf fdroidserver.egg-info; sudo rm -rf fdroidserver.egg-info;
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.2;
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo $PATH;
sudo add-apt-repository ppa:guardianproject/fdroidserver -y; echo $JAVA_HOME;
sudo apt-get -q update -y; /usr/libexec/java_home;
sudo apt-get -q install -y --no-install-recommends python3 python3-dev java -version;
python3-git python3-pil python3-libcloud python3-logilab-astng which java;
python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules javac -version;
python3-requests python3-venv python3-yaml rsync which javac;
pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev; jarsigner -help;
sudo pip3 install pylint; which jarsigner;
fi keytool -help;
which keytool;
fi
script: script:
- cd tests - cd tests
@ -46,5 +58,4 @@ script:
after_failure: after_failure:
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
- ls -lRa env
- ls -lR | curl -F 'clbin=<-' https://clbin.com - ls -lR | curl -F 'clbin=<-' https://clbin.com