diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-06-18 00:24:24 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-06-18 00:24:24 +0200 |
| commit | ff2b9a066fe180539f2a1955b7ad1dcf4af829c0 (patch) | |
| tree | f7db39ff692cd10f0459ba4a6b4c34597c4355de /.github/workflows/build.yml | |
| parent | 207043d250b8a2c10250c647100bf01d1e4d5007 (diff) | |
| parent | b49f33b6daa86c2a88b4e096eedd18815ef25245 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# .github/workflows/build.yml
# .gitignore
# CMakeLists.txt
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef9513853f..2517a25337 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,6 @@ jobs: -DMODPLUG=ON -DWAVPACK=ON -DINSTALL_USER_UDEV_RULES=OFF - cmake_generator: Unix Makefiles ctest_args: compiler_cache: ccache compiler_cache_path: ~/.ccache @@ -41,7 +40,6 @@ jobs: -DMACOS_BUNDLE=ON -DMODPLUG=OFF -DWAVPACK=OFF - cmake_generator: Unix Makefiles # TODO: Fix this broken test on macOS ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory cpack_generator: DragNDrop @@ -70,7 +68,6 @@ jobs: -DWAVPACK=ON cc: cl cxx: cl - cmake_generator: Ninja # TODO: Fix these broken tests on Windows ctest_args: --exclude-regex '^AutoDJProcessorTest.*$' cpack_generator: WIX @@ -244,12 +241,10 @@ jobs: - name: "Configure" run: >- - cmake - -G "${{ matrix.cmake_generator }}" + cmake ${{ matrix.cmake_args }} ${{ env.CMAKE_ARGS_EXTRA }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="${{ env.CMAKE_PREFIX_PATH }}" - -DDEBUG_ASSERTIONS_FATAL=ON - -DQt5_DIR=${{ env.QT_PATH }} ${{ matrix.cmake_args }} ${{ env.CMAKE_ARGS_EXTRA }} + -DDEBUG_ASSERTIONS_FATAL=OFF -DBATTERY=ON -DBROADCAST=ON -DDOWNLOAD_MANUAL=ON |