Merge branch '2.3' of github.com:mixxxdj/mixxx into main

2 files changed, 38 insertions, 7 deletions

diff --git a/.github/workflows/clazy.yml b/.github/workflows/build-checks.yml
index 084a2aeac4..297851d952 100644
--- a/.github/workflows/clazy.yml
+++ b/.github/workflows/build-checks.yml
@@ -1,12 +1,18 @@
-name: clazy
+name: build-checks
 
 on:
   push:
   pull_request:
 
 jobs:
-  clazy:
+  build-checks:
+    strategy:
+      matrix:
+        include:
+          - name: clazy
+          - name: clang-tidy
     runs-on: ubuntu-20.04
+    name: ${{ matrix.name }}
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -47,10 +53,12 @@ jobs:
           qtscript5-dev \
           qt5keychain-dev \
           clazy \
+          clang-tidy \
           cmake
     - name: Create build directory
-      run: mkdir cmake_build
-    - name: Configure
+      run: mkdir build
+    - name: Configure (clazy)
+      if: matrix.name == 'clazy'
       # Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
       run: |
         cmake \
@@ -72,17 +80,40 @@ jobs:
           -DMODPLUG=ON \
           -DWAVPACK=ON \
           ..
-      working-directory: cmake_build
+      working-directory: build
       env:
         LD: clang++
         CC: clang
         CXX: clazy
+    - name: Configure (clang-tidy)
+      if: matrix.name == 'clang-tidy'
+      run: |
+        cmake \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DCLANG_TIDY=clang-tidy \
+          -DWARNINGS_FATAL=ON \
+          -DBATTERY=ON \
+          -DBROADCAST=ON \
+          -DBULK=ON \
+          -DHID=ON \
+          -DLILV=ON \
+          -DOPUS=ON \
+          -DQTKEYCHAIN=ON \
+          -DVINYLCONTROL=ON \
+          -DFFMPEG=ON \
+          -DKEYFINDER=ON \
+          -DLOCALECOMPARE=ON \
+          -DMAD=ON \
+          -DMODPLUG=ON \
+          -DWAVPACK=ON \
+          ..
+      working-directory: build
     - name: Set up problem matcher
       uses: ammaraskar/gcc-problem-matcher@master
     - name: Build
       # Do not abort on errors and build/check the whole project
       run: cmake --build . -j $(nproc) -- --keep-going
-      working-directory: cmake_build
+      working-directory: build
       env:
         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
         CLAZY_IGNORE_DIRS: lib/.*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3567dcf9d5..549528282b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -150,7 +150,7 @@ jobs:
 
     - name: "[Windows] Set up Windows code signing"
       env:
-        WINDOWS_CODESIGN_CERTIFICATE_PATH: ${{ github.workspace }}\build\certificates\windows_sectigo_codesign_certificate.pfx
+        WINDOWS_CODESIGN_CERTIFICATE_PATH: ${{ github.workspace }}\packaging\certificates\windows_sectigo_codesign_certificate.pfx
         WINDOWS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_CERTIFICATE_PASSWORD }}
         WINDOWS_CODESIGN_SECURE_FILE_SALT: ${{ secrets.WINDOWS_CODESIGN_SECURE_FILE_SALT }}
         WINDOWS_CODESIGN_SECURE_FILE_SECRET: ${{ secrets.WINDOWS_CODESIGN_SECURE_FILE_SECRET }}