diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-02 17:10:29 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-03 21:20:39 +0200 |
| commit | 3a4ac966d0b6e33b5f2d469180ededa80923f7f7 (patch) | |
| tree | 61712117d765fda61294633372037f91de795a36 | |
| parent | a383c5c1a5821b87abaa93ea083ca96317b410ff (diff) | |
| download | meson-3a4ac966d0b6e33b5f2d469180ededa80923f7f7.zip meson-3a4ac966d0b6e33b5f2d469180ededa80923f7f7.tar.gz meson-3a4ac966d0b6e33b5f2d469180ededa80923f7f7.tar.bz2 | |
Fix OSX CI with current homebrew
Since [1], python3 is now an alias for python, so installing it, rather than
upgrading it, will fail.
It seems that homebrew can't do this upgrade without breaking python2, so
uninstall and reinstall python2 (and mercurial which depends on it) to work
around that problem.
[1] https://brew.sh/2018/01/19/homebrew-1.5.0/
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f077c9c..8540d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,8 @@ matrix: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall python mercurial; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python@2 python@3 mercurial; fi # Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:artful; fi |