diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-29 08:41:06 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-29 08:41:06 -0700 |
| commit | 1b5b5226441568cf70cac9e609e675f44cc6847a (patch) | |
| tree | 869749a343951447df08996253aec3e58c712212 /.travis.yml | |
| parent | db7fe92a9a5c63e0d9b6f0fe6f1ad379f2b0b46a (diff) | |
| parent | c98a53b6644fae81536a4a7e658227804fc787f3 (diff) | |
Merge remote-tracking branch 'mixxxdj/2.2'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 66621edec1..074be87a34 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,11 +52,7 @@ before_install: # Virtual X, needed for analyzer waveform tests - 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 lame; 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 lame; fi install: #### |