[6.0] 50c46f386 Cleanup travis' osx job and bump image

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 31 13:08:24 UTC 2018


commit 50c46f3864a0792bb1f6e3835b1b5cf06147fc71
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Sep 26 07:19:26 2018 -0600

    Cleanup travis' osx job and bump image

diff --git a/.travis.yml b/.travis.yml
index 4441126b0..1b0751c8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     env: CLANG=6.0 SAN_FLAGS="--enable-asan --enable-ubsan"
     sudo: required
   - os: osx
-    osx_image: xcode9.3
+    osx_image: xcode10
     compiler: clang
   allow_failures:
   - os: osx
@@ -36,7 +36,6 @@ before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update
-      brew upgrade python
       brew install docutils sphinx-doc nghttp2
       export PATH="/usr/local/opt/sphinx-doc/bin:$PATH"
     elif [[ -n "$CLANG" ]]; then
@@ -59,9 +58,6 @@ before_install:
   - ./configure ${CONFIGURE_ARGS}
 script:
   - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      export PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages
-    fi
     if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
       make -j3 distcheck
     else


More information about the varnish-commit mailing list