fix intermittent test failure

[fdroidserver.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8af3260630aca5228955aa45cde7f958ede7d3be..21e55bc92126fcaa02687b7021dd0763317e6da9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,11 @@ matrix:
     - os: linux
       language: android
     - os: osx
-      osx_image: xcode9.1
+      osx_image: xcode9.3beta
+      env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
+      env: ANDROID_HOME=/usr/local/share/android-sdk
+    - os: osx
+      osx_image: xcode9.2
       env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
       env: ANDROID_HOME=/usr/local/share/android-sdk
     - os: osx
@@ -57,7 +61,12 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       set -x;
       brew update > /dev/null;
-      brew install dash bash python3 gradle jenv;
+      if [ "`sw_vers -productVersion | sed 's,10\.\([0-9]*\).*,\1,'`" -gt 10 ]; then
+        brew upgrade python;
+      else
+        brew install python3;
+      fi;
+      brew install dash bash gradle jenv;
       brew install gnu-sed --with-default-names;
       if ! ruby -e 'v = `javac -version 2>&1`.split()[1].gsub("_", "."); exit Gem::Dependency.new("", "~> 1.8.0.131").match?("", v)'; then
         brew cask uninstall java --force;
@@ -65,13 +74,16 @@ install:
       fi;
       brew cask install android-sdk;
 
+      export AAPT_VERSION=`sed -n "s,^MINIMUM_AAPT_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`;
       mkdir -p "$ANDROID_HOME/licenses";
       echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license";
+      echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$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" > /dev/null 2&>1;
-      echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;25.0.2" > /dev/null 2&>1;
-      echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23" > /dev/null 2&>1;
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools";
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$AAPT_VERSION";
+      echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23";
 
+      sudo pip3 install babel;
       sudo pip3 install --quiet --editable . ;
       sudo rm -rf fdroidserver.egg-info;