summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2019-01-09 14:20:54 +0000
committerAlex Bennée <alex.bennee@linaro.org>2019-01-14 14:52:30 +0000
commit91fa7dd100c9ce2d46e7cefddd935207e8a54ec7 (patch)
tree259da100d2b3d13077efe0e597cae6e10e4c42a1
parent45ebc239f3eeb8231e7fd237ffb4d4ea86cbca97 (diff)
downloadfocaccia-qemu-91fa7dd100c9ce2d46e7cefddd935207e8a54ec7.tar.gz
focaccia-qemu-91fa7dd100c9ce2d46e7cefddd935207e8a54ec7.zip
travis: use homebrew addon for MacOSX
Rather than poking homebrew manually we can specify the packages
needed via the homebrew addon. These are only installed on MacOS based
builds.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--.travis.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index fa70429459..2ef7997d25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,12 @@ addons:
       - sparse
       - uuid-dev
       - gcovr
+  homebrew:
+    packages:
+      - libffi
+      - gettext
+      - glib
+      - pixman
 
 
 # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
@@ -68,9 +74,6 @@ git:
   submodules: false
 
 
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi
 before_script:
   - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
   - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }