From 673e2e2f10596dd3597e195160ef15c331a27794 Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Sat, 2 Dec 2017 09:20:18 +0100 Subject: [PATCH] Fix OSX travis build (they upgraded their default image). --- .travis.yml | 6 ++++++ scripts/ci-install-osx-deps.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af5d0f8d6..28dd0e44d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,12 @@ matrix: - compiler: clang os: osx env: BUILD_TYPE=Release +# For now only run on xcode8.3, which is the default image, since OSX testing on Travis can take a long time. +# osx_image: xcode8.3 +# - compiler: clang +# os: osx +# env: BUILD_TYPE=Release +# osx_image: xcode7.3 env: global: diff --git a/scripts/ci-install-osx-deps.sh b/scripts/ci-install-osx-deps.sh index d7e26ddd3..ba43e97e1 100755 --- a/scripts/ci-install-osx-deps.sh +++ b/scripts/ci-install-osx-deps.sh @@ -14,7 +14,8 @@ brew update # remove numpy, which is present in the travis image. # It will be installed from brew as opencv dependency, which fails if already present. -/usr/bin/yes | pip uninstall numpy > /dev/null 2>&1 +PIP=`which pip` || PIP=pip2 # newer osx travis images don't have pip executable +/usr/bin/yes | $PIP uninstall numpy > /dev/null # 2>&1 brew install eigen glew opencv libzip