From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Fam Zheng" <fam@euphon.net>
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 [thread overview]
Message-ID: <87zhs9vk72.fsf@linaro.org> (raw)
In-Reply-To: <20190109163114.17010-10-berrange@redhat.com>
Daniel P. Berrangé <berrange@redhat.com> 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é <berrange@redhat.com>
> ---
> .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
next prev parent reply other threads:[~2019-01-09 17:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 16:31 [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 01/13] tests: run ldconfig after installing extra software Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 02/13] tests: remove obsolete 'debian' dockerfile Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 03/13] tests: update Fedora dockerfile to use Fedora 29 Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 04/13] tests: update Fedora i386 cross image to " Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 05/13] travis: add whitespace between each major section & matrix entry Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 06/13] travis: define all the build matrix entries in one place Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 07/13] travis: standardize the syntax used for env variables Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 08/13] travis: don't clone git submodules upfront Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 09/13] travis: move macOS brew setup into the macOS matrix entries Daniel P. Berrangé
2019-01-09 17:01 ` Alex Bennée [this message]
2019-01-09 17:13 ` Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 10/13] travis: stop redefining the script commands Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 11/13] travis: stop using container based envs Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 12/13] travis: run tests in verbose mode Daniel P. Berrangé
2019-01-09 16:31 ` [Qemu-devel] [PATCH 13/13] travis: remove matrix settings that duplicate global settings Daniel P. Berrangé
2019-01-13 19:53 ` [Qemu-devel] [PATCH 00/13] Misc fixes / improvements for the docker and travis configs no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhs9vk72.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=fam@euphon.net \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).