From e58c6e1b738bd65f8cab1c1903772a35ceddddb0 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 2 Sep 2018 20:23:22 -0700 Subject: travis: fix macOS builds, avoid brew autoupdate --- .travis.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c5889c324..d5242f5ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,13 +142,18 @@ cache: # Work around Travis's lack of support for Python on OSX before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions python > /dev/null || brew install python; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm /usr/local/include/c++ ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions gcc > /dev/null || brew install gcc; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions gnupg2 > /dev/null || brew install gnupg2; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew update; + export HOMEBREW_NO_AUTO_UPDATE=1; + rm /usr/local/include/c++ ; + brew ls --versions gcc > /dev/null || brew install gcc; + brew ls --versions gnupg2 > /dev/null || brew install gnupg2; + brew install python@2; + pip2 install --upgrade pip; + pip2 install virtualenv; + virtualenv venv; + source venv/bin/activate; + fi # Install various dependencies install: -- cgit v1.2.3-60-g2f50