travis: Use a more recent OS X image

Using the xcode8 image does not work currently (libcurl is not found).
This commit is contained in:
Tobias Brunner 2016-09-23 10:08:13 +02:00
parent 6b3e408ba5
commit 8486b3b438
2 changed files with 3 additions and 2 deletions

View File

@ -12,7 +12,7 @@ before_install:
- ./scripts/test.sh pydeps
before_script:
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true
script:
- ./scripts/test.sh
@ -52,4 +52,5 @@ matrix:
dist: precise
- compiler: clang
os: osx
osx_image: xcode7
env: TEST=osx

View File

@ -96,7 +96,7 @@ osx)
export ACLOCAL_PATH=$BREW_PREFIX/opt/gettext/share/aclocal:$ACLOCAL_PATH
for pkg in openssl curl
do
PKG_CONFIG_PATH=$BREW_PREFIX/opt/$PKG/lib/pkgconfig:$PKG_CONFIG_PATH
PKG_CONFIG_PATH=$BREW_PREFIX/opt/$pkg/lib/pkgconfig:$PKG_CONFIG_PATH
CPPFLAGS="-I$BREW_PREFIX/opt/$pkg/include $CPPFLAGS"
LDFLAGS="-L$BREW_PREFIX/opt/$pkg/lib $LDFLAGS"
done