diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-28 18:25:02 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-28 19:03:38 -0700 |
| commit | 0ef35606b5c1b6591fe881375a25c0667ac9f417 (patch) | |
| tree | c8b979acd1a585473111ec83a362c66f0dd43d6f /.travis.yml | |
| parent | 96f139d8fe70b209eddf249230e88d35d16a70e6 (diff) | |
Update Travis to use the default xcode/macOS version.
By pinning to xcode 7, we pinned ourselves to macOS 10.11, which is no
longer "bottled" for most Homebrew dependencies. The macOS build has
been timing out for weeks because we've been trying to build many
dependencies from source.
Also, remove the workaround for Python 2 with portmidi. Portmidi's
Homebrew formula has been updated to remove Python support.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index adbb7e9653..60bad3ebd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ matrix: compiler: gcc - os: osx - osx_image: xcode7.3 compiler: clang # install dependencies addons: @@ -53,10 +52,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0 ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - # Homebrew uses Python 3 now, and portmidi depends on Python 2 which triggers this bug: - # https://github.com/Homebrew/homebrew-core/issues/26358 - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv; fi install: #### |