move brew update to .travis.yml

skvark · skvark · commit a84cc17c85c2 · 2019-02-23T15:03:12.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ cache:
     - $HOME/local_bottle_metadata
     # `cache: ccache: true` has no effect if `language:` is not `c` or `cpp`
     - $HOME/.ccache
-    
+
 matrix:
   fast_finish: true
   include:
@@ -618,8 +618,9 @@ before_install: |
     source multibuild_customize.sh
     echo $ENABLE_CONTRIB > contrib.enabled
     echo $ENABLE_HEADLESS > headless.enabled
-    
+
     if [ -n "$IS_OSX" ]; then
+        brew update --merge
         TAPS="$(brew --repository)/Library/Taps"
         if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
             rm -rf "$TAPS/caskroom/homebrew-cask"
@@ -629,10 +630,10 @@ before_install: |
                     cd $(dirname '\''{}'\'')
                     git clean -fxd
                     git status' \;
-                    
+
         brew_cache_cleanup
     fi
-    
+
     before_install
     # Not interested in travis internal scripts' output
     set +x
@@ -653,7 +654,7 @@ script: |
     #otherwise, Travis logic terminates prematurely
     #https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
     trap ERR
-    
+
     test "$rc" -eq 0
 
 before_cache: |
@@ -667,10 +668,10 @@ before_cache: |
         fi
 
         brew_cache_cleanup
-        
+
     fi
     set +x
-    
+
 after_success: |
     # Upload wheels to pypi if requested
     if [ -n "$TRAVIS_TAG" ]; then
diff --git a/config.sh b/config.sh
@@ -92,7 +92,6 @@ function pre_build {
   if [ -n "$IS_OSX" ]; then
     echo "Running for OSX"
 
-    brew update --force
     brew_add_local_bottles
 
     # Don't query analytical info online on `brew info`,
