From: Alex Bennée <alex.bennee@linaro.org>
Date: Tue, 7 Jan 2020 13:38:28 +0000 (+0000)
Subject: travis.yml: install homebrew python for OS X
X-Git-Tag: qemu-xen-4.14.0~205^2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=289c8e592127eedb192d0f508f62f9f6531c0449;p=qemu-xen.git

travis.yml: install homebrew python for OS X

Our python3 requirements now outstrip those of the build. While we are
at it we can move more of the special casing for Mac into the one
build we have.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---

diff --git a/.travis.yml b/.travis.yml
index 6826618ea8..6c1038a0f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,13 +51,6 @@ addons:
       - sparse
       - uuid-dev
       - gcovr
-  homebrew:
-    packages:
-      - ccache
-      - glib
-      - pixman
-      - gnu-sed
-    update: true
 
 
 # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
@@ -239,7 +232,17 @@ matrix:
       os: osx
       osx_image: xcode10.3
       compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - ccache
+            - glib
+            - pixman
+            - gnu-sed
+            - python
+          update: true
       before_script:
+        - brew link --overwrite python
         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
         - if command -v ccache ; then ccache --zero-stats ; fi
         - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}