From: Eric Engestrom <eric.engestrom@intel.com>
Date: Fri, 18 Oct 2019 14:03:43 +0000 (+0100)
Subject: travis: don't (re)install python
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b0853a43da4dd266e49f777e2462eed56301a38f;p=mesa.git

travis: don't (re)install python

The new Mac OS X images apparently already have python2 and python3,
and `brew` considers asking to install something already installed
as a fatal error...

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.travis.yml b/.travis.yml
index 97720cf118a..cc4d0b260d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,10 @@ matrix:
 before_install:
   - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext
   - if test "x$BUILD" = xmeson; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja;
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja;
     fi
   - if test "x$BUILD" = xscons; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python2 scons;
+      HOMEBREW_NO_AUTO_UPDATE=1 brew install scons;
     fi
 
   # Set PATH for homebrew pip3 installs