[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the ma
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries |
Date: |
Wed, 09 Jan 2019 17:01:53 +0000 |
User-agent: |
mu4e 1.1.0; emacs 26.1.91 |
Daniel P. Berrangé <address@hidden> writes:
> There is no need to use shell conditionals to run commands when they can
> simply be listed under the appropriate matrix entry.
>
> Signed-off-by: Daniel P. Berrangé <address@hidden>
> ---
> .travis.yml | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index fa70429459..b5f520034f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -68,9 +68,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; }
> @@ -171,6 +168,8 @@ matrix:
> os: osx
> osx_image: xcode9.4
> compiler: clang
> + before_install:
> + - brew update && brew install libffi gettext glib pixman
>
>
> - env:
> @@ -178,6 +177,8 @@ matrix:
> os: osx
> osx_image: xcode10
> compiler: clang
> + before_install:
> + - brew update && brew install libffi gettext glib pixman
Does this override the global before_install:? I appreciate we've just
cleaned that up but if we add it again....
Regardless there is a homebrew add-ons now we can use.
>
>
> # Python builds
--
Alex Bennée
- [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 05/13] travis: add whitespace between each major section & matrix entry, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 02/13] tests: remove obsolete 'debian' dockerfile, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 04/13] tests: update Fedora i386 cross image to Fedora 29, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 06/13] travis: define all the build matrix entries in one place, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 01/13] tests: run ldconfig after installing extra software, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 03/13] tests: update Fedora dockerfile to use Fedora 29, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 08/13] travis: don't clone git submodules upfront, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 07/13] travis: standardize the syntax used for env variables, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries, Daniel P . Berrangé, 2019/01/09
- Re: [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries,
Alex Bennée <=
- [Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 11/13] travis: stop using container based envs, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 12/13] travis: run tests in verbose mode, Daniel P . Berrangé, 2019/01/09
- [Qemu-devel] [PATCH 13/13] travis: remove matrix settings that duplicate global settings, Daniel P . Berrangé, 2019/01/09
- Re: [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs, no-reply, 2019/01/13