From c6126744f8e42a0b934b39ccc2dd2bb73af8a01d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 11 Mar 2018 14:08:29 -0400 Subject: [PATCH 1/2] Tro to fix macOS TravisCI build. --- .travis/dispatch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/dispatch.sh b/.travis/dispatch.sh index 374c8f10..840387bc 100755 --- a/.travis/dispatch.sh +++ b/.travis/dispatch.sh @@ -72,6 +72,7 @@ setup_test_venv() { if [[ "${SALT_NODE_ID}" =~ servo-mac.* ]]; then brew update brew upgrade python + brew unlink python fi # Use the system Python 3 to make it easy to run tests on fresh hosts # Make sure dependencies are installed (like `python3-venv` on Debian derivatives) From 0bd9797ad89241f621b27e1a39fa16c31e41e106 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 11 Mar 2018 14:22:18 -0400 Subject: [PATCH 2/2] Attempt to fix macOS TravisCI build. --- .travis/dispatch.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis/dispatch.sh b/.travis/dispatch.sh index 840387bc..85f9f425 100755 --- a/.travis/dispatch.sh +++ b/.travis/dispatch.sh @@ -69,11 +69,6 @@ setup_test_venv() { fi travis_fold_start 'test_venv.install_python3' \ 'Setting up Python 3 virtualenv for testing' - if [[ "${SALT_NODE_ID}" =~ servo-mac.* ]]; then - brew update - brew upgrade python - brew unlink python - fi # Use the system Python 3 to make it easy to run tests on fresh hosts # Make sure dependencies are installed (like `python3-venv` on Debian derivatives) salt_call --retcode-passthrough state.sls python @@ -100,6 +95,10 @@ if (( EUID != 0 )); then SUDO="sudo" fi +if [[ "${SALT_NODE_ID}" =~ servo-mac.* ]]; then + brew update + brew upgrade python +fi if [[ "${SALT_NODE_ID}" == "test" ]]; then # Run test suite separately for parallelism