diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-09 22:26:58 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-09 22:26:58 +0100 |
| commit | 22a9111566ec765ae3b615cd381dfd9ba4d0e74b (patch) | |
| tree | 2b2611fd323d1b6a40412e56b6f88f0dec27a564 /.travis.yml | |
| parent | 1456b8ba417e3cf8b9097eea90428fabd5154b79 (diff) | |
.travis.yml: Include "scons" in build config naming
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 6d651b3992..2d042c22ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: c++ # TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu env: global: - - COMMON_FLAGS="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" + - SCONS_MIXXX_COMMON_FLAGS="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" jobs: include: @@ -27,21 +27,21 @@ jobs: - python3-setuptools - python3-wheel - - name: Ubuntu/gcc build + - name: Ubuntu/gcc/SCons build os: linux dist: xenial compiler: gcc # Ubuntu Xenial build prerequisites - env: EXTRA_FLAGS="localecompare=1" + env: SCONS_MIXXX_EXTRA_FLAGS="localecompare=1" install: - - scons $COMMON_FLAGS $EXTRA_FLAGS + - scons $SCONS_MIXXX_COMMON_FLAGS $SCONS_MIXX_EXTRA_FLAGS 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. # https://bugs.launchpad.net/mixxx/+bug/1699689 - ./mixxx-test - - name: OSX/clang build + - name: OSX/clang/SCons build os: osx compiler: clang # Workaround for bug in libopus's opus.h including <opus_multistream.h> @@ -55,7 +55,7 @@ jobs: - export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)" - echo "QTDIR=$QTDIR" install: - - scons $COMMON_FLAGS $EXTRA_FLAGS + - scons $SCONS_MIXXX_COMMON_FLAGS $SCONS_MIXXX_EXTRA_FLAGS script: # lldb doesn't provide an easy way to exit 1 on error: # https://bugs.llvm.org/show_bug.cgi?id=27326 |