commit 511712d86327ec1039b7e844978ed6aa33b76660
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Nov 03 18:51:10 2018 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Sat Nov 03 18:51:10 2018 -0400
tree e774dfbd75ea0ad17bc08a1a66abf7fcaec5beb6
parent dca56eacbad4f2c70a2334c4cba2a6e96b581162

ci: fix another issue with preinstalled homebrew packages on Travis

Change-Id: I7aa53d7ac0daadf8eb2b970ae0fe289899aa023d

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b1deb97..22258a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,10 +58,10 @@
       osx_image: xcode9.4
       env: OSX_VERSION=10.13
     - os: osx
-      osx_image: xcode10
+      osx_image: xcode10.1
       env: OSX_VERSION=10.13
     - os: osx
-      osx_image: xcode10
+      osx_image: xcode10.1
       env: OSX_VERSION=10.13 USE_OPENSSL_1_1=yes
 
   allow_failures:
@@ -92,11 +92,13 @@
 before_script:
   - if [[ ${TRAVIS_OS_NAME} == linux ]]; then export NODE_LABELS="Linux Ubuntu Ubuntu-16.04"; fi
   - if [[ ${TRAVIS_OS_NAME} == osx ]]; then export NODE_LABELS="OSX OSX-${OSX_VERSION}"; fi
-  - if [[ ${OSX_VERSION} == 10.12 ]]; then brew update; fi
+  - if [[ ${TRAVIS_OS_NAME} == osx ]]; then brew update; fi
   # workaround for https://github.com/Homebrew/homebrew-core/issues/26358
   - if [[ ${OSX_VERSION} == 10.12 ]]; then brew outdated python || brew upgrade python; fi
   # workaround for https://github.com/travis-ci/travis-ci/issues/6688
   - if [[ ${OSX_VERSION} == 10.12 ]]; then /usr/bin/yes | pip2 uninstall numpy || true; fi
+  # workaround for https://github.com/travis-ci/travis-ci/issues/8826
+  - if [[ ${TRAVIS_OS_NAME} == osx ]]; then brew cask uninstall --force oclint || true; fi
   - if [[ -n ${COMPILER} ]]; then export CXX=${COMPILER}; fi
   - ${CXX:-c++} --version
   - python --version