| Message ID | 20190110174516.21586-12-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next queue for travis and docker | expand |
On Thu, Jan 10, 2019 at 05:45:08PM +0000, Alex Bennée wrote: > 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> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Dupe > --- > .travis.yml | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > 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 A separate patch can also drop libffi & gettext since travis logs show they are already installed these days. > + - 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; } Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
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; }