summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2020-01-07 13:38:28 +0000
committerAlex Bennée <alex.bennee@linaro.org>2020-01-09 11:41:29 +0000
commit289c8e592127eedb192d0f508f62f9f6531c0449 (patch)
tree6c86c6c490b1fc6943e05e85a79fb5ff88815176
parent6e3bd8a072d79b30c842ab67a0656e3a399e92f3 (diff)
downloadqemu-289c8e592127eedb192d0f508f62f9f6531c0449.zip
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>
-rw-r--r--.travis.yml17
1 files changed, 10 insertions, 7 deletions
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}