From 08556e6db339a745da94ee4afcfa2c2fc4eb68b8 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 22 Jul 2016 17:45:03 -0400 Subject: [PATCH 1/2] ci: install homebrew's zlib on mac --- script/cibuild.sh | 4 ++++ script/install-deps-osx.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/script/cibuild.sh b/script/cibuild.sh index 92e926490..2772dcd15 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -6,6 +6,10 @@ then exit $?; fi +if [ "$TRAVIS_OS_NAME" = "osx" ]; then + export PKG_CONFIG_PATH=$(ls -d /usr/local/Cellar/zlib/*/lib/pkgconfig | paste -s -d':' -) +fi + # Should we ask Travis to cache this file? curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar >poxyproxy.jar || exit $? # Run this early so we know it's ready by the time we need it diff --git a/script/install-deps-osx.sh b/script/install-deps-osx.sh index 5510379d4..da0672d2b 100755 --- a/script/install-deps-osx.sh +++ b/script/install-deps-osx.sh @@ -3,4 +3,5 @@ set -x brew update +brew install homebrew/dupes/zlib brew install libssh2 From 0239eff354e5880ceae079b7ddd04d1b01f664ac Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sun, 24 Jul 2016 14:51:28 -0400 Subject: [PATCH 2/2] ci: install homebrew's curl on mac --- script/cibuild.sh | 2 +- script/install-deps-osx.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/script/cibuild.sh b/script/cibuild.sh index 2772dcd15..979eb0ce4 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -7,7 +7,7 @@ then fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then - export PKG_CONFIG_PATH=$(ls -d /usr/local/Cellar/zlib/*/lib/pkgconfig | paste -s -d':' -) + export PKG_CONFIG_PATH=$(ls -d /usr/local/Cellar/{curl,zlib}/*/lib/pkgconfig | paste -s -d':' -) fi # Should we ask Travis to cache this file? diff --git a/script/install-deps-osx.sh b/script/install-deps-osx.sh index da0672d2b..4b8393b19 100755 --- a/script/install-deps-osx.sh +++ b/script/install-deps-osx.sh @@ -4,4 +4,5 @@ set -x brew update brew install homebrew/dupes/zlib +brew install curl brew install libssh2