diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-05-16 13:20:03 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-05-22 11:18:33 +0200 |
| commit | d4d428b1309921a9d949aa291db71bab1ca187ec (patch) | |
| tree | 60989aa77d1f46e3db587251354b5913fa7ed334 | |
| parent | 2091896785e359eec3dc3c42381519ab01397e58 (diff) | |
.travis.yml: Use macOS buildenv instead of homebrew
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 046dd2d10b..2608a066e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: # For SCons builds - SCONSFLAGS="test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" # For CMake builds - - CMAKEFLAGS="-DMAD=ON -DFAAD=ON -DOPUS=ON -DMODPLUG=ON -DWAVPACK=ON -DHSS1394=OFF" + - CMAKEFLAGS="-DOPUS=ON -DHSS1394=OFF" - GTEST_COLOR=1 - CTEST_OUTPUT_ON_FAILURE=1 @@ -70,7 +70,7 @@ jobs: compiler: gcc cache: ccache # Ubuntu Bionic build prerequisites - env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON" + env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON -DFAAD=ON -DWAVPACK=ON -DMAD=ON -DMODPLUG=ON" before_install: - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" - export CTEST_PARALLEL_LEVEL="$(nproc)" @@ -139,20 +139,28 @@ jobs: # 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 + addons: + homebrew: + update: true + packages: + - ccache env: >- - CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=OFF -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/" + MIXXX_ENVPATH="${HOME}/buildenv" + CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=OFF -DFAAD=OFF -DWAVPACK=OFF -DWAVPACK=OFF -DMAD=OFF -DMODPLUG=OFF" + PATH="/usr/local/opt/ccache/bin:$PATH" DISPLAY=:99.0 CMAKE_BUILD_PARALLEL_LEVEL=4 CTEST_PARALLEL_LEVEL=1 before_install: - - brew install ccache - - export PATH="/usr/local/opt/ccache/bin:$PATH" + - mkdir "${MIXXX_ENVPATH}" + - read -r MIXXX_ENVNAME < build/osx/golden_environment + - curl "https://downloads.mixxx.org/builds/buildserver/2.3.x-macosx/${MIXXX_ENVNAME}.tar.gz" | tar xzf - --strip 1 -C "${MIXXX_ENVPATH}" - cmake --version - ccache -s install: - mkdir cmake_build - cd cmake_build - - cmake -L $CMAKEFLAGS $CMAKEFLAGS_EXTRA .. + - cmake -L $CMAKEFLAGS $CMAKEFLAGS_EXTRA -DCMAKE_PREFIX_PATH=${MIXXX_ENVPATH} -DQt5_DIR=${MIXXX_ENVPATH}/Qt-5.12.3/lib/cmake/Qt5/ .. - cmake --build . - sudo cmake --build . --target install script: |