Skip to content

V
varnish-cache
Commit 50c46f38 authored by Federico G. Schwindt's avatar Federico G. Schwindt Committed by Dridi Boukelmoune
Browse files
Options

Cleanup travis' osx job and bump image

parent 0e347111
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
.travis.yml
View file @ 50c46f38
...@@ -16,7 +16,7 @@ matrix: ...@@ -16,7 +16,7 @@ matrix:
env: CLANG=6.0 SAN_FLAGS="--enable-asan --enable-ubsan" env: CLANG=6.0 SAN_FLAGS="--enable-asan --enable-ubsan"
sudo: required sudo: required
- os: osx - os: osx
osx_image: xcode9.3 osx_image: xcode10
compiler: clang compiler: clang
allow_failures: allow_failures:
- os: osx - os: osx
...@@ -36,7 +36,6 @@ before_install: ...@@ -36,7 +36,6 @@ before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update brew update
brew upgrade python
brew install docutils sphinx-doc nghttp2 brew install docutils sphinx-doc nghttp2
export PATH="/usr/local/opt/sphinx-doc/bin:$PATH" export PATH="/usr/local/opt/sphinx-doc/bin:$PATH"
elif [[ -n "$CLANG" ]]; then elif [[ -n "$CLANG" ]]; then
...@@ -59,9 +58,6 @@ before_install: ...@@ -59,9 +58,6 @@ before_install:
- ./configure ${CONFIGURE_ARGS} - ./configure ${CONFIGURE_ARGS}
script: script:
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
export PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages
fi
if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
make -j3 distcheck make -j3 distcheck
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment