Merge pull request multi-build#139 from matthew-brett/osx-reliability

Osx reliability improvements

Author: xoviat

.travis.yml

@@ -6,10 +6,6 @@ cache:
   directories:
    - $HOME/.ccache
 
-env:
-  global:
-    - HOMEBREW_NO_AUTO_UPDATE=1
-
 matrix:
   include:
     - os: linux
@@ -27,11 +23,6 @@ matrix:
         - TEST_BUILDS=1
         - USE_CCACHE=1
       sudo: required
-    - os: osx
-      osx_image: xcode6.4
-      env:
-        - PYTHON_VERSION=2.7.11
-        - TEST_BUILDS=1
     - os: osx
       osx_image: xcode6.4
       env:

configure_build.sh

@@ -22,6 +22,9 @@ if [ -n "$IS_OSX" ]; then
     export CFLAGS="${CFLAGS:-$ARCH_FLAGS}"
     export CXXFLAGS="${CXXFLAGS:-$ARCH_FLAGS}"
     export FFLAGS="${FFLAGS:-$ARCH_FLAGS}"
+
+    # Disable homebrew auto-update
+    export HOMEBREW_NO_AUTO_UPDATE=1
 fi
 
 # Promote BUILD_PREFIX on search path to any newly built libs

osx_utils.sh

@@ -281,9 +281,6 @@ function get_macpython_environment {
     local version=$1
     local venv_dir=$2
 
-    # We MUST set this before calling homebrew or it could potentially fail
-    # See travis-ci issue #8552 for more details
-    export HOMEBREW_NO_AUTO_UPDATE=1
 
     if [ "$USE_CCACHE" == "1" ]; then
         activate_ccache

travis_osx_steps.sh

@@ -18,6 +18,8 @@ source $MULTIBUILD_DIR/library_builders.sh
 # config.sh can override any function defined here.
 
 function before_install {
+    # Uninstall oclint. See Travis-CI gh-8826
+    brew cask uninstall oclint || true    
     export CC=clang
     export CXX=clang++
     get_macpython_environment $MB_PYTHON_VERSION venv