.travis.yml: Cleanup travis config and run linter as separate job

1 files changed, 42 insertions, 43 deletions

diff --git a/.travis.yml b/.travis.yml
index fc351bc47b..0804cb0917 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,54 @@
 language: c++
 
+
+# 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.
+# TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu
+env: 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"
+
 matrix:
   include:
     - os: linux
       dist: xenial
-      sudo: required
+      before_install:
+        - pip3 install tinycss
+      script:
+        - ./scripts/qsscheck.py .
+
+    - os: linux
+      dist: xenial
       compiler: gcc
+      # Ubuntu Xenial build prerequisites
+      env: EXTRA_FLAGS="localecompare=1"
+      install:
+        - scons $COMMON_FLAGS $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
+
+
     - os: osx
       compiler: clang
+      # Workaround for bug in libopus's opus.h including <opus_multistream.h>
+      # instead of <opus/opus_multistream.h>.
+      # Virtual X (Xvfb) is needed for analyzer waveform tests
+      env: >-
+        CFLAGS="-isystem /usr/local/include/opus"
+        CXXFLAGS="-isystem /usr/local/include/opus"
+        DISPLAY=:99.0
+      before_install:
+      - export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)"
+      install:
+        - scons $COMMON_FLAGS $EXTRA_FLAGS
+      before_script:
+        - export 
+      script:
+        # lldb doesn't provide an easy way to exit 1 on error:
+        # https://bugs.llvm.org/show_bug.cgi?id=27326
+        - lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k "script import os; os._exit(1)"
 
 git:
   depth: 1
@@ -86,48 +127,6 @@ addons:
       - taglib
       - wavpack
 
-before_install:
-  - pip3 install tinycss
-
-install:
-  # 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.
-  # TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu
-  - export 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"
-
-  # 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
-
-  # 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
-
-  # 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.
-  # TODO(2019-07-21): Move "ffmpeg=1" into COMMON_FLAGS if FFmpeg 4.x becomes available in Ubuntu
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export EXTRA_FLAGS="ffmpeg=1 optimize=none asan=0 localecompare=0"; fi
-
-  - scons $COMMON_FLAGS $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.
-  # https://bugs.launchpad.net/mixxx/+bug/1699689
-  - 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" = "linux" ]; then ./scripts/qsscheck.py . ; fi
 
 notifications:
   webhooks: