diff options
| author | Edward Thomson <ethomson@github.com> | 2016-07-24 15:47:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-24 15:47:58 -0400 |
| commit | 378d12ac850377039056c0fe1adcb7e5c20ab90c (patch) | |
| tree | a8876d461c6ddb8ebcab23d69926dd5dbbe70282 | |
| parent | c18a2bc4e013c07c497e9811f1d796852773d348 (diff) | |
| parent | 0239eff354e5880ceae079b7ddd04d1b01f664ac (diff) | |
| download | libgit2-378d12ac850377039056c0fe1adcb7e5c20ab90c.tar.gz | |
Merge pull request #3868 from libgit2/ethomson/mac_build
ci: point to the homebrew libssh2 install
| -rwxr-xr-x | script/cibuild.sh | 4 | ||||
| -rwxr-xr-x | script/install-deps-osx.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/script/cibuild.sh b/script/cibuild.sh index 92e926490..979eb0ce4 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/{curl,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..4b8393b19 100755 --- a/script/install-deps-osx.sh +++ b/script/install-deps-osx.sh @@ -3,4 +3,6 @@ set -x brew update +brew install homebrew/dupes/zlib +brew install curl brew install libssh2 |