Re: [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries

[Alex Bennée]

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