diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-01 23:44:38 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-01 23:44:38 +0200 |
| commit | 2e543cd8e6069c47002ee9b28ae35cfe4e39cd59 (patch) | |
| tree | 058e2df591f5a193de4d43dd41ecdbacc55af312 /.travis.yml | |
| parent | cf70247a1e344534f9ff258a1eca8295ddf567f7 (diff) | |
| parent | 947694bc2ab3f65ac7452e09128dbbb7c60cdb1b (diff) | |
Merge remote-tracking branch 'upstream/master' into lv2_support2
Conflicts:
.travis.yml
src/effects/effect.cpp
src/effects/effect.h
src/effects/effectchainmanager.h
src/effects/effectinstantiator.h
src/effects/effectmanifest.h
src/effects/effectrack.cpp
src/effects/native/autopaneffect.cpp
src/effects/native/balanceeffect.cpp
src/effects/native/biquadfullkilleqeffect.h
src/effects/native/bitcrushereffect.cpp
src/effects/native/echoeffect.cpp
src/effects/native/echoeffect.h
src/effects/native/filtereffect.cpp
src/effects/native/flangereffect.cpp
src/effects/native/loudnesscontoureffect.cpp
src/effects/native/phasereffect.cpp
src/effects/native/reverbeffect.cpp
src/effects/native/threebandbiquadeqeffect.h
src/engine/effects/engineeffect.cpp
src/engine/effects/engineeffect.h
src/mixxx.cpp
src/preferences/dialog/dlgpreferences.cpp
src/preferences/dialog/dlgpreferences.h
src/test/metaknob_link_test.cpp
src/test/nativeeffects_test.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e154e0fdcc..932b4eee18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,16 @@ addons: - protobuf-compiler - scons - vamp-plugin-sdk + - qtkeychain-dev - liblilv-dev 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; fi install: @@ -57,7 +61,8 @@ install: # Common # Build flags common to OS X and Linux. - - export COMMON="test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" + # Parallel builds are important for avoiding OSX build timeouts. + - export COMMON="-j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" ##### # Ubuntu Trusty Build @@ -73,10 +78,10 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXXFLAGS="-isystem /usr/local/include/opus" ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-isystem /usr/local/include/opus" ; fi - # NOTE(rryan): 11/15/2016 we are experiencing Travis timeouts for the OSX + # NOTE(rryan): 2016-11-15 we are experiencing Travis timeouts for the OSX # build. Turning off optimizations to see if that speeds up compile times. We # also need to avoid going over 4MB of output so we turn off verbose mode. - # NOTE(rryan): 12/31/2016 Homebrew has dropped qt4 support. Build with qt5. + # NOTE(rryan): 2016-12-31 Homebrew has dropped qt4 support. Build with qt5. # TODO(rryan): localecompare doesn't work on Travis with qt5 for some reason. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 verbose=0 qt5=1 localecompare=0" ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi @@ -86,5 +91,12 @@ install: - scons $COMMON $EXTRA_FLAGS script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then gdb --batch -ex run -ex "thread apply all bt full" -ex quit ./mixxx-test ; fi + # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in + # return code in order to avoid having a sucessful build when a test fail. + # https://bugs.launchpad.net/mixxx/+bug/1699689 + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./mixxx-test ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k quit ; fi + +notifications: + webhooks: + - https://mixxx.zulipchat.com/api/v1/external/travis?stream=travis&topic=build-status&api_key=$ZULIP_API_KEY |