diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2018-06-15 20:35:11 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2018-06-15 20:35:18 +0300 |
| commit | 066383353d2410e5421695f992110f45e82c791e (patch) | |
| tree | 7250d6747b0c8e8ff04fcfa504d19910957b02a8 /scripts/travis-ci | |
| parent | e85191b28410226a5c8d4166e4ce8ff1391c952a (diff) | |
travis-ci: Fix MacOS build for new images
We install the protobuf package via brew, which depends on "python@2".
The build image upgraded the installed "python", and now "python@2" conflicts with it when trying to create symlinks.
We don’t use the symlinked "python" installed by default in the image, so we unlink it to allow the "python@2" package to be installed without conflict.
Diffstat (limited to 'scripts/travis-ci')
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index 7b1847418..e22e3f5db 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -64,7 +64,17 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then exit 1 fi elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then - brew update && brew install qt5 libogg libvorbis flac libsndfile protobuf openssl ice + # We install the protobuf package via brew, + # which depends on "python@2". + # + # The build image upgraded the installed "python", + # and now "python@2" conflicts with it when trying + # to create symlinks. + # + # We don’t use the symlinked "python" installed + # by default in the image, so we unlink it to allow + # the "python@2" package to be installed without conflict. + brew update && brew unlink python && brew install qt5 libogg libvorbis flac libsndfile protobuf openssl ice else exit 1 fi |