diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-07-31 22:04:28 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-01 15:57:46 +0300 |
| commit | 6306c56804dddcda1a0916d00be0fa927950cf92 (patch) | |
| tree | a7103e9501b120472d3467cc4c3750d70cf0dccb | |
| parent | 448b93fbe57bff6f2c4708b482ec352c2ed37793 (diff) | |
| download | meson-6306c56804dddcda1a0916d00be0fa927950cf92.zip meson-6306c56804dddcda1a0916d00be0fa927950cf92.tar.gz meson-6306c56804dddcda1a0916d00be0fa927950cf92.tar.bz2 | |
Fix .travis.yml for updated OSX image
Since [1], OSX builds on travis fail with:
Error: Refusing to uninstall /usr/local/Cellar/python/3.6.5_1
because it is required by gdal, numpy, postgis, which are currently installed.
Revise #3163
[1] https://blog.travis-ci.com/2018-07-19-xcode9-4-default-announce
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6f31f99..197c803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,7 @@ matrix: before_install: - python ./skip_ci.py --base-branch-env=TRAVIS_BRANCH --is-pull-env=TRAVIS_PULL_REQUEST - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; 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 qt pkg-config; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt pkg-config; 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:bionic; fi |