From 1db5e0276f9641e57744508e5e81356f804a9592 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 00cde0ada..54b4f1b58 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 + mkdir _build cd _build # shellcheck disable=SC2086 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 0c7e546fa748334a3fd3413db442132b7d6b166b 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 54b4f1b58..5707f01cb 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 mkdir _build 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