diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-05-12 00:16:39 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-05-12 00:16:39 +0200 |
| commit | e0a34218466731b8ea8f8fd2942a7947c3282367 (patch) | |
| tree | 855a7a7cf74df899260ca969b2b720a12269cf79 /.github/workflows/build.yml | |
| parent | ba13154264af3498dfad53d46fe621dd220cc653 (diff) | |
| parent | 772b110d6ad5199ac0475271cd16aec5297ec901 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# .github/workflows/build.yml
# src/mixxx.cpp
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e5d6b03c4..dce6fd1219 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,6 @@ jobs: -DWAVPACK=ON -DINSTALL_USER_UDEV_RULES=OFF cmake_generator: Unix Makefiles - cmake_build_type: RelWithDebInfo ctest_args: compiler_cache: ccache compiler_cache_path: ~/.ccache @@ -43,7 +42,6 @@ jobs: -DMODPLUG=OFF -DWAVPACK=OFF cmake_generator: Unix Makefiles - cmake_build_type: RelWithDebInfo # TODO: Fix this broken test on macOS ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory cpack_generator: DragNDrop @@ -73,7 +71,6 @@ jobs: cc: cl cxx: cl cmake_generator: Ninja - cmake_build_type: RelWithDebInfo # TODO: Fix these broken tests on Windows ctest_args: --exclude-regex '^AutoDJProcessorTest.*$' cpack_generator: WIX @@ -246,7 +243,7 @@ jobs: run: >- cmake -G "${{ matrix.cmake_generator }}" - -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} + -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 }} @@ -276,7 +273,7 @@ jobs: uses: ammaraskar/msvc-problem-matcher@master - name: "Build" - run: cmake --build . --config ${{ matrix.cmake_build_type }} + run: cmake --build . --config RelWithDebInfo working-directory: build env: CC: ${{ matrix.cc }} @@ -301,7 +298,7 @@ jobs: CTEST_OUTPUT_ON_FAILURE: 1 - name: Benchmark - run: cmake --build . --target mixxx-benchmark --config ${{ matrix.cmake_build_type }} + run: cmake --build . --target mixxx-benchmark --config RelWithDebInfo working-directory: build env: # Render analyzer waveform tests to an offscreen buffer |