Fix Travis OSX builds

nixprime · Feb 12, 2017 · a2eed58 · a2eed58
1 parent ccc7a51
commit a2eed58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,6 @@ addons:
       - python-dev
       - python3-dev
 
-osx_image: xcode7
-
 install: ./.travis/install.sh
 
 script: ./.travis/script.sh
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -8,9 +8,9 @@ if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then
     brew update
     # Skip updating Boost, since doing so takes a long time and we'd like to
     # know about compatibility breakage anyway.
-    brew install cmake
+    brew install cmake || brew outdated cmake || brew upgrade cmake
     case "${TEST_PY}" in
-        py2) brew outdated python || brew upgrade python;;
-        py3) brew install python3;;
+        py2) brew install python || brew outdated python || brew upgrade python;;
+        py3) brew install python3 || brew outdated python3 || brew upgrade python3;;
     esac
 fi