diff options
| author | Be <be@mixxx.org> | 2018-05-27 09:17:26 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2018-05-27 09:17:26 -0500 |
| commit | 0ac8b0d0e23ab7bd21cbeb62e265c62e2917d037 (patch) | |
| tree | 137c09eeb9b1acb6de6adb7241bdaedc8aeb045b /.travis.yml | |
| parent | 9a6c13c1176bc959c78c0f3722be9d92e8f9d83d (diff) | |
| parent | 553bd5e4a4a88498223c47ac0067a656e4773c7b (diff) | |
Merge remote-tracking branch 'upstream/master' into lv2_support2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 932b4eee18..6a0e3454c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,9 @@ addons: - libopusfile-dev - libportmidi-dev - libprotobuf-dev - - libqt4-dev - - libqt4-opengl-dev - - libqt4-sql-sqlite + - libqt5opengl5-dev + - libqt5sql5-sqlite + - libqt5svg5-dev - librubberband-dev - libshout3-dev - libsndfile1-dev @@ -42,6 +42,8 @@ addons: - libwavpack-dev - portaudio19-dev - protobuf-compiler + - qt5-default + - qtscript5-dev - scons - vamp-plugin-sdk - qtkeychain-dev @@ -62,7 +64,8 @@ install: # Build flags common to OS X and Linux. # 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" + # We turn off verbose output to avoid going over the 4MB output limit. + - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" ##### # Ubuntu Trusty Build @@ -70,7 +73,7 @@ install: #### # OS X Build - # Define QTDIR. Homebrew does not support Qt4 anymore, so /usr/local/Cellar/qt stores Qt5 installs. + # Define QTDIR. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1) ; fi # Workaround for bug in libopus's opus.h including <opus_multistream.h> @@ -79,11 +82,9 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-isystem /usr/local/include/opus" ; fi # 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): 2016-12-31 Homebrew has dropped qt4 support. Build with qt5. + # build. Turning off optimizations to see if that speeds up compile times. # 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" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 localecompare=0" ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi #### @@ -92,10 +93,12 @@ install: script: # 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. + # return code in order to avoid having a successful 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 + # lldb doesn't provide an easy way to exit 1 on error: + # https://bugs.llvm.org/show_bug.cgi?id=27326 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k "script import os; os._exit(1)" ; fi notifications: webhooks: |