From ea670287f39d9a2322f043afb9873909d14a18bc Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Thu, 2 Jan 2020 12:33:50 +0900 Subject: [PATCH] macOS CI: fix package conflicts due to Homebrew's Python 2 --- .circleci/config.yml | 5 ++++- .travis/osx..before_install.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a3be541b5..f7f509d7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,7 +178,10 @@ jobs: - *restore_cache - run: name: Install Homebrew dependencies - command: brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla + command: | + # unlink Homebrew's python 2 to prevent an node-gyp error + brew unlink python@2 || true + brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla - run: name: Install nodejs dependencies command: npm install -g appdmg diff --git a/.travis/osx..before_install.sh b/.travis/osx..before_install.sh index b59920a5e..61f25af66 100755 --- a/.travis/osx..before_install.sh +++ b/.travis/osx..before_install.sh @@ -3,3 +3,5 @@ set -e brew update +# Python 2 may cause conflicts on dependency installation +brew unlink python@2 || true