From 596c627a1eb2b32e2755ae5b9bf32235cf8ce72b Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:39:09 +0200
Subject: [PATCH 1/2] ci: Fix brew in Travis

---
 ci/test/04_install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index 62c8df964..8ffbc551c 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -19,7 +19,6 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
   git reset --hard origin/master
   popd || exit 1
   set -o errexit
-  ${CI_RETRY_EXE} brew unlink python@2
   ${CI_RETRY_EXE} brew update
   # brew upgrade returns an error if any of the packages is already up to date
   # Failure is safe to ignore, unless we really need an update.

From 25c8b73656c90f7b78a90f25c5bcc308f8b7c598 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 26 Mar 2020 12:28:44 +0200
Subject: [PATCH 2/2] ci: Use Homebrew addon on native macOS

Also the macOS image has been updated.
---
 .travis.yml                      | 16 ++++++++++++++--
 ci/test/00_setup_env_mac_host.sh |  1 -
 ci/test/04_install.sh            | 19 -------------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9a111c03a..e61bba4af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -153,8 +153,20 @@ jobs:
       name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
       os: osx
       # Use the most recent version:
-      # Xcode 11.2.1, macOS 10.14, JDK 13.0.1, SDK 10.15
+      # Xcode 11.3.1, macOS 10.14, SDK 10.15
       # https://docs.travis-ci.com/user/reference/osx/#macos-version
-      osx_image: xcode11.2
+      osx_image: xcode11.3
+      addons:
+        homebrew:
+          packages:
+          - libtool
+          - berkeley-db4
+          - boost
+          - miniupnpc
+          - qt
+          - qrencode
+          - python3
+          - ccache
+          - zeromq
       env: >-
         FILE_ENV="./ci/test/00_setup_env_mac_host.sh"
diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh
index 0b437a723..5753c3af3 100644
--- a/ci/test/00_setup_env_mac_host.sh
+++ b/ci/test/00_setup_env_mac_host.sh
@@ -7,7 +7,6 @@
 export LC_ALL=C.UTF-8
 
 export HOST=x86_64-apple-darwin16
-export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config qt qrencode python3 ccache zeromq"
 export PIP_PACKAGES="zmq"
 export RUN_CI_ON_HOST=true
 export RUN_UNIT_TESTS=true
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index 8ffbc551c..acf7eeb92 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -14,27 +14,8 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
 fi
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  set +o errexit
-  pushd /usr/local/Homebrew || exit 1
-  git reset --hard origin/master
-  popd || exit 1
-  set -o errexit
-  ${CI_RETRY_EXE} brew update
-  # brew upgrade returns an error if any of the packages is already up to date
-  # Failure is safe to ignore, unless we really need an update.
-  brew upgrade $BREW_PACKAGES || true
-
-  # install new packages (brew install returns an error if already installed)
-  for i in $BREW_PACKAGES; do
-    if ! brew list | grep -q $i; then
-      ${CI_RETRY_EXE} brew install $i
-    fi
-  done
-
   export PATH="/usr/local/opt/ccache/libexec:$PATH"
-
   ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
-
 fi
 
 mkdir -p "${BASE_SCRATCH_DIR}"