diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-11-21 03:11:51 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-11-21 04:09:23 +0100 |
| commit | 232d193121c50f0af7b07c5ee1b5eae7f0f54c7b (patch) | |
| tree | 109a27adbdbb64228cb5b3cb301ae004d9b9a145 /.github | |
| parent | 627d567e849b42eb212ceed508ec3b127d435349 (diff) | |
| parent | e47d6499245dc6822132ec621ff01317c7849b55 (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx into gh-actions-improvements
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/clazy.yml | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5be8792cd6..fb1189aa82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,14 +11,24 @@ jobs: include: - name: Ubuntu 18.04 (gcc) os: ubuntu-18.04 - # TODO for Ubuntu Focal: Replace "-DFAAD=ON" with "-DFFMPEG=ON" - cmake_args: -DFAAD=ON -DKEYFINDER=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=O + cmake_args: -DFAAD=ON -DKEYFINDER=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON ctest_args: ccache_path: ~/.ccache cpack_generator: DEB buildenv_script: tools/ubuntu_buildenv.sh artifacts_name: Ubuntu DEB artifacts_path: cmake_build/*.deb + apt_packages: libfaad-dev libmp4v2-dev + - name: Ubuntu 20.04 (gcc) + os: ubuntu-20.04 + cmake_args: -DFFMPEG=ON -DKEYFINDER=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON + ctest_args: + ccache_path: ~/.ccache + cpack_generator: DEB + buildenv_script: tools/ubuntu_buildenv.sh + artifacts_name: Ubuntu DEB + artifacts_path: cmake_build/*.deb + apt_packages: libavcodec-dev libavutil-dev - name: macOS 10.15 os: macos-10.15 cmake_args: -DCOREAUDIO=ON -DHSS1394=ON -DMACOS_BUNDLE=ON @@ -57,7 +67,6 @@ jobs: libavformat-dev \ libchromaprint-dev \ libebur128-dev \ - libfaad-dev \ libfftw3-dev \ libflac-dev \ libid3tag0-dev \ @@ -65,7 +74,6 @@ jobs: libmad0-dev \ libmodplug-dev \ libmp3lame-dev \ - libmp4v2-dev \ libopus-dev \ libopusfile-dev \ libportmidi-dev \ diff --git a/.github/workflows/clazy.yml b/.github/workflows/clazy.yml index f64fe06786..8c5a08c1f3 100644 --- a/.github/workflows/clazy.yml +++ b/.github/workflows/clazy.yml @@ -82,4 +82,4 @@ jobs: run: cmake --build . -j $(nproc) working-directory: cmake_build env: - CLAZY_CHECKS: level1,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast + CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event |