From 756197a69cd5f622260cb1d49313e67a14a8aea5 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 28 Jan 2017 11:23:59 +0530
Subject: [PATCH] Squashed commit of the following:

commit 33ad1abb1e3469eac489590d9b79bd5c282d7440
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Wed Jan 4 18:21:07 2017 +0530

    Make osx_image global

commit d90a99f0523f2bd01a817d81dc42c8e952afb39c
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 22:21:02 2017 +0530

    include not exclude the osx image

commit 4038ca84bd6bec03ff92fc82897ccd14b3ebf40a
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 21:36:46 2017 +0530

    Fix osx_image location again

commit 232dfdb0bcc93438e02b03364faef889caf37f8a
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 21:16:15 2017 +0530

    Fix incorrect location of overriding osx_image

commit 00a487cb6fce8e5da302f2dd9b64df3558f2e4bb
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 20:58:09 2017 +0530

    Force sierra instead of el-capitan

    See https://github.com/cartr/homebrew-qt4/issues/7

commit 33c39b8e240958c8f277fadcbb4a0da540134a4e
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 20:37:26 2017 +0530

    Troubleshoot osx build break changeset #4

commit 8d168099fb1dabaf61b6d7cd3a391a6285a4bb9c
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 19:03:56 2017 +0530

    Troubleshoot Travis OSX build break changeset #3

commit ae149d0263a73da515bd81b965828c047d68d401
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 18:24:51 2017 +0530

    troubleshoot osx build break - changeset #2

commit 262633967951ac2e490426cc29b06d5569e44fd2
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 18:11:46 2017 +0530

    debug changes to troubleshoot osx build break

commit f3423b7d84929d98794dfd95009b6bbbedacf07a
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Sun Jan 1 12:49:57 2017 +0530

    Use latest protobuf version in HomeBrew

    We had reverted to using protobuf 2.6 when protobuf 3.0 had a regression
    issue with respect to RPCs - this has been fixed in v3.1.0
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5efa3f5..535c0eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: cpp
+osx_image: xcode8.2
 
 os:
   - linux
@@ -14,7 +15,7 @@ matrix:
       compiler: gcc
 
 before_install:
-  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf260; fi"
+  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew tap cartr/qt4 && brew tap-pin cartr/qt4 && brew install qt && brew install protobuf && ls -lR /usr/local/include; fi"
 
 addons:
   apt: