xserver: Branch 'master'

[Adam Jackson]

 .travis.yml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5893e72a20ffa5cfcd6d0c7c5c934b92546d76c3
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Tue Oct 24 12:07:08 2017 +0100

    travis: Fix OSX build
    
    Turn off homebrew autoupdating before installing ccache, to avoid:
    
    /usr/local/Homebrew/Library/Homebrew/brew.rb:12:in `<main>': Homebrew must
    be run under Ruby 2.3! You're running 2.0.0. (RuntimeError)
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/.travis.yml b/.travis.yml
index a70b55f4c..856360e27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull anholt/xserver-travis ; fi
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
 
 before_script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v6 > Dockerfile ; fi