diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-07-21 12:47:11 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-07-21 14:31:24 +0200 |
| commit | 10d9b9340f4c6e3b7ea02e03b2f73707a3ee7cb6 (patch) | |
| tree | 81478d4934102d54e9bb87ad3731cc29833a7e2f /.travis.yml | |
| parent | b1da854fd88ffc64a1bccb5144dd2b7eafeda58c (diff) | |
Enable Ubuntu Xenial build in Travis CI
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 8640ef0763..52f853ef83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,21 @@ language: c++ + matrix: include: - # - os: linux - # dist: trusty - # sudo: required - # compiler: gcc - + - os: linux + dist: xenial + sudo: required + compiler: gcc - os: osx compiler: clang -# install dependencies + +git: + depth: 1 + +services: + # Virtual X is needed for analyzer waveform tests + - xvfb + addons: apt: sources: @@ -74,25 +81,18 @@ addons: - taglib - wavpack -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 - install: #### - # Common + # Common build prerequisites # Build flags common to OS X and Linux. # Parallel builds are important for avoiding OSX build timeouts. # We turn off verbose output to avoid going over the 4MB output limit. - - 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 verbose=0" + - export COMMON="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" ##### - # Ubuntu Trusty Build - - #### - # OS X Build + # Ubuntu Xenial build prerequisites + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi # Define QTDIR. - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1) ; fi @@ -105,13 +105,16 @@ install: # 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. # 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 localecompare=0" ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="ffmpeg=1 optimize=none asan=0 localecompare=0" ; fi #### - # Common Build + # Common build - scons $COMMON $EXTRA_FLAGS +before_script: + # Virtual X (Xvfb) is needed for analyzer waveform tests + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0 ; fi + script: # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in # return code in order to avoid having a successful build when a test fail. |