From 38aa5a7a7fc13a6738133e29dbb92ba74a9d83ef Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 7 Jun 2018 17:54:40 +0200
Subject: [PATCH] travis: Skip macOS upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Upgrading takes quite a bit of time, doesn't offer any
real value and causes a lot of grief. Let's just skip it.

We need to install xz explicitly now, since it's required
to make dist and no longer being dragged in by Python 3.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac0d48a606..f99e1cd6e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,10 +43,8 @@ matrix:
       env:
         - 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 ccache rpcgen yajl
+        - brew install ccache rpcgen xz yajl
       before_script:
         - ./autogen.sh --prefix=$(pwd)/install-root
       script:
-- 
2.47.2