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:
parent
6b3e408ba5
commit
8486b3b438
|
@ -12,7 +12,7 @@ before_install:
|
||||||
- ./scripts/test.sh pydeps
|
- ./scripts/test.sh pydeps
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
|
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./scripts/test.sh
|
- ./scripts/test.sh
|
||||||
|
@ -52,4 +52,5 @@ matrix:
|
||||||
dist: precise
|
dist: precise
|
||||||
- compiler: clang
|
- compiler: clang
|
||||||
os: osx
|
os: osx
|
||||||
|
osx_image: xcode7
|
||||||
env: TEST=osx
|
env: TEST=osx
|
||||||
|
|
|
@ -96,7 +96,7 @@ osx)
|
||||||
export ACLOCAL_PATH=$BREW_PREFIX/opt/gettext/share/aclocal:$ACLOCAL_PATH
|
export ACLOCAL_PATH=$BREW_PREFIX/opt/gettext/share/aclocal:$ACLOCAL_PATH
|
||||||
for pkg in openssl curl
|
for pkg in openssl curl
|
||||||
do
|
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"
|
CPPFLAGS="-I$BREW_PREFIX/opt/$pkg/include $CPPFLAGS"
|
||||||
LDFLAGS="-L$BREW_PREFIX/opt/$pkg/lib $LDFLAGS"
|
LDFLAGS="-L$BREW_PREFIX/opt/$pkg/lib $LDFLAGS"
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue