diff options
author | Edward Thomson <ethomson@github.com> | 2016-07-22 17:45:03 -0400 |
---|---|---|
committer | Edward Thomson <ethomson@github.com> | 2016-07-22 21:10:25 -0400 |
commit | 08556e6db339a745da94ee4afcfa2c2fc4eb68b8 (patch) | |
tree | 48b25ea5fb2cd78cbf70e41e4a928089c8ed4f1b | |
parent | c18a2bc4e013c07c497e9811f1d796852773d348 (diff) | |
download | libgit2-08556e6db339a745da94ee4afcfa2c2fc4eb68b8.tar.gz |
ci: install homebrew's zlib on mac
-rwxr-xr-x | script/cibuild.sh | 4 | ||||
-rwxr-xr-x | script/install-deps-osx.sh | 1 |
2 files changed, 5 insertions, 0 deletions
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 |