From 300f6ac5bf5263fd1a73e93e4fa700420d59e850 Mon Sep 17 00:00:00 2001 From: xzyfer Date: Wed, 21 Sep 2016 23:17:35 +1000 Subject: [PATCH] Fix OSX CI failures [Brew released 1.0.0][1] was released today and in true major release fashion it has broken OSX CI builds. [1]: http://brew.sh/2016/09/02/homebrew-1.0.0/ --- script/ci-install-deps | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/script/ci-install-deps b/script/ci-install-deps index a9a6df6346..3705247b71 100755 --- a/script/ci-install-deps +++ b/script/ci-install-deps @@ -7,8 +7,16 @@ else fi if [ "x$AUTOTOOLS" == "xyes" ]; then - sudo add-apt-repository -y ppa:rbose-debianizer/automake &> /dev/null - sudo apt-get -qq update - sudo apt-get -qq install automake AUTOTOOLS=yes + + if [ "$TRAVIS_OS_NAME" == "linux" ]; then + sudo add-apt-repository -y ppa:rbose-debianizer/automake &> /dev/null + sudo apt-get -qq update + sudo apt-get -qq install automake + fi + + if [ "$TRAVIS_OS_NAME" == "osx" ]; then + brew uninstall libtool + brew install libtool + fi fi