diff options
| author | Edward Thomson <ethomson@github.com> | 2016-10-01 19:29:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 19:29:55 -0500 |
| commit | 58a2a8fa2b61119760782816936b670ec49ae02b (patch) | |
| tree | a15803a289b94740e8e86adb40f8a119a3e29324 | |
| parent | e9f10cdad1f513cb334f7534b3ea72a94431c95c (diff) | |
| parent | 0c7e546fa748334a3fd3413db442132b7d6b166b (diff) | |
| download | libgit2-58a2a8fa2b61119760782816936b670ec49ae02b.tar.gz | |
Merge pull request #3949 from libgit2/ethomson/v24-updates
Some CI fixes for the maint/v0.24 branch
| -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 00cde0ada..5707f01cb 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 + mkdir _build cd _build # shellcheck disable=SC2086 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 |