From 15ccd250412dd2307e16f03d162699653784cbcc Mon Sep 17 00:00:00 2001 From: Srivats P Date: Tue, 13 Sep 2016 20:37:03 +0530 Subject: [PATCH 1/2] Use protobuf-2.6 for osx builds since 3.0 breaks ostinato build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efefcb0..c76dcf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: compiler: gcc before_install: - - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi" + - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf-2.6.0; fi" addons: apt: From 2422df21ca72c2427f68a1cb6ff3005725a4f2d3 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Tue, 13 Sep 2016 21:20:32 +0530 Subject: [PATCH 2/2] Rename protobuf version to 'tap' into correct one --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c76dcf9..5efa3f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: compiler: gcc before_install: - - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf-2.6.0; fi" + - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf260; fi" addons: apt: