fix intermittent test failure

[fdroidserver.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 87adfa86e585268fe71959376cfbb541b6d0b935..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;