Mesa (master): travis: don't (re)install python
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 18 14:28:14 UTC 2019
Module: Mesa
Branch: master
Commit: b0853a43da4dd266e49f777e2462eed56301a38f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0853a43da4dd266e49f777e2462eed56301a38f
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Fri Oct 18 15:03:43 2019 +0100
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 at intel.com>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
More information about the mesa-commit
mailing list