From e9851c3a48071e0096ded498deef8fceade5f075 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <jonas.fonseca@gmail.com>
Date: Fri, 11 Jan 2019 21:19:27 +0100
Subject: [PATCH 1/2] Add workaround for brew build failure

---
 .travis.yml     | 8 ++++----
 tools/travis.sh | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e60a4b45c..e39db9129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,11 +30,11 @@ matrix:
     script: tools/travis.sh
   - if: branch = master
     os: osx
-    env:
+    env: TIG_BUILD=brew
     compiler: clang
-    script: brew install --HEAD tig
+    script: tools/travis.sh
   - if: branch = master
     os: osx
-    env:
+    env: TIG_BUILD=brew
     compiler: gcc
-    script: brew install --HEAD tig
+    script: tools/travis.sh
diff --git a/tools/travis.sh b/tools/travis.sh
index a8af33959..1445399ae 100755
--- a/tools/travis.sh
+++ b/tools/travis.sh
@@ -45,11 +45,17 @@ build_valgrind() {
 	make all-debug test TEST_OPTS=valgrind
 }
 
+build_brew() {
+	brew update
+	brew install --HEAD tig
+}
+
 case "$TIG_BUILD" in
 	config.make)		build_config_make ;;
 	autoconf)		build_autoconf ;;
 	address-sanitizer)	build_address_sanitizer ;;
 	valgrind)		build_valgrind ;;
+	brew)			build_brew ;;
 
 	*)
 		echo "Unknown config: $TIG_BUILD"

From 4a09bc97be1a3a7add8fc559f0b7c5a8b8aeba90 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <jonas.fonseca@gmail.com>
Date: Fri, 11 Jan 2019 23:53:51 +0100
Subject: [PATCH 2/2] Test the brew build

---
 .travis.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e39db9129..11b4078ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,21 +20,7 @@ script: tools/travis.sh
 
 matrix:
   include:
-  - env: TIG_BUILD=valgrind
-    script: tools/travis.sh
-  - env: TIG_BUILD=address-sanitizer
-    compiler: clang
-    # LeakSanitizer requires ptrace capabilities
-    # https://github.com/travis-ci/travis-ci/issues/9033
-    sudo: required
-    script: tools/travis.sh
-  - if: branch = master
-    os: osx
+  - os: osx
     env: TIG_BUILD=brew
     compiler: clang
     script: tools/travis.sh
-  - if: branch = master
-    os: osx
-    env: TIG_BUILD=brew
-    compiler: gcc
-    script: tools/travis.sh