diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-07-21 14:07:32 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-07-21 16:36:26 +0200 |
| commit | 2af8e2fba39d0fefe486c613b6790892bdcb6a10 (patch) | |
| tree | ce569b1f371d340ddb349a2f2b2afa911ecdd220 /.travis.yml | |
| parent | 10d9b9340f4c6e3b7ea02e03b2f73707a3ee7cb6 (diff) | |
Simplify shell commands
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 52f853ef83..a99c73ee7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,20 +92,20 @@ install: ##### # Ubuntu Xenial build prerequisites - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi + - 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 + - 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> # instead of <opus/opus_multistream.h>. - - 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 + - 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): 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="ffmpeg=1 optimize=none asan=0 localecompare=0" ; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export EXTRA_FLAGS="ffmpeg=1 optimize=none asan=0 localecompare=0"; fi #### # Common build @@ -113,16 +113,16 @@ install: before_script: # Virtual X (Xvfb) is needed for analyzer waveform tests - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0 ; fi + - 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. # https://bugs.launchpad.net/mixxx/+bug/1699689 - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./mixxx-test ; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ./mixxx-test; 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 + - 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: |