diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-12-26 09:27:13 -0800 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-12-26 09:27:13 -0800 |
| commit | 974bb2ad1b7ad1a06ddfc167903d29d977b142cc (patch) | |
| tree | cd06248fb943ddc3f5de7ac861964ad50df4332f /.travis.yml | |
| parent | c05360f110f0280c028cf4d42fc4add94924f7c8 (diff) | |
| parent | 84ca00e624d8ceaa0ce9d503f699ec37b0718e39 (diff) | |
Merge remote-tracking branch 'mixxxdj/master' into remove-vamp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 9495808007..e6c3898809 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: c++ matrix: include: - - os: linux - dist: trusty - sudo: required - compiler: gcc + # - os: linux + # dist: trusty + # sudo: required + # compiler: gcc - os: osx - osx_image: xcode7.3 compiler: clang # install dependencies addons: @@ -44,6 +43,7 @@ addons: - protobuf-compiler - qt5-default - qtscript5-dev + - libqt5x11extras5-dev - scons - qtkeychain-dev - liblilv-dev @@ -51,11 +51,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: #### |