diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-07-04 01:12:03 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-07-04 01:12:03 +0200 |
commit | 08e092fb02dc6ccf0062578db8b16d6e2a464d6b (patch) | |
tree | cc4d9ff07f92f16a2d59ddd74467ffbbb9cc851e /.travis.yml | |
parent | a6fd5d87fa1fe52670f8aa0c8dc862b846e342a2 (diff) | |
parent | e50e8fc10837e7fa6986c2ec75f584d716040de3 (diff) |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 49b9ea0daa..93b8d1f597 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ env: - CMAKEFLAGS="-DCMAKE_BUILD_TYPE=Release -DBATTERY=ON -DBROADCAST=ON -DBULK=ON -DDEBUG_ASSERTIONS_FATAL=ON -DHID=ON -DLILV=ON -DOPUS=ON -DQTKEYCHAIN=ON -DVINYLCONTROL=ON" - GTEST_COLOR=1 - CTEST_OUTPUT_ON_FAILURE=1 + # Render analyzer waveform tests to an offscreen buffer + - QT_QPA_PLATFORM=offscreen jobs: include: @@ -127,11 +129,9 @@ jobs: - taglib # 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: - brew install scons - export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)" @@ -175,7 +175,6 @@ jobs: MIXXX_ENVPATH="${HOME}/buildenv" CMAKEFLAGS_EXTRA="-DCOREAUDIO=ON -DHSS1394=ON" PATH="/usr/local/opt/ccache/bin:$PATH" - DISPLAY=:99.0 CMAKE_BUILD_PARALLEL_LEVEL=4 CTEST_PARALLEL_LEVEL=1 before_install: @@ -212,10 +211,6 @@ jobs: git: depth: 1 -services: - # Virtual X is needed for analyzer waveform tests - - xvfb - # Common Addons addons: apt: |