[libvirt] [PATCH 0/2] travis: Minor macOS improvements
Andrea Bolognani (2): travis: Move PATH to macOS-specific environment travis: Install and use ccache on macOS .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.0
Now that we have separate sections for each build configuration, there's no reason to set PATH in the global environment. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4dd0427a9..ddc902888e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ matrix: - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd" - compiler: clang os: osx + env: + - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" before_install: - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update @@ -105,9 +107,6 @@ git: env: global: - # The custom $PATH is just to pick up some extra binaries installed - # through homebrew on macOS and it's completely harmless on Linux - - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" - VIR_TEST_DEBUG=1 before_script: -- 2.17.0
As documented in [1], ccache needs to be installed and configured explicitly on macOS. [1] https://docs.travis-ci.com/user/caching/#ccache-cache Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ddc902888e..c71411dcae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,12 @@ matrix: - compiler: clang os: osx env: - - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH" + - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH" before_install: - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update - brew upgrade - - brew install python rpcgen yajl + - brew install python ccache rpcgen yajl script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us -- 2.17.0
On Wed, May 30, 2018 at 03:13:32PM +0200, Andrea Bolognani wrote:
Andrea Bolognani (2): travis: Move PATH to macOS-specific environment travis: Install and use ccache on macOS
.travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé