Merge remote-tracking branch 'mixxx/main' into nic/track-move-controls

.github/labeler.yml

@@ -22,7 +22,12 @@ code quality:
           - .pre-commit-config.yaml
           - pyproject.toml
 
-controllers:
+controller backend:
+  - changed-files:
+      - any-glob-to-any-file:
+          - src/controllers/**
+
+controller mappings:
   - changed-files:
       - any-glob-to-any-file:
           - res/controllers/**

.github/workflows/build-checks.yml

@@ -25,7 +25,7 @@ jobs:
     name: ${{ matrix.name }}
     steps:
       - name: Check out repository
-        uses: actions/[email protected].1
+        uses: actions/[email protected].6
       - name: Install build dependencies
         run: tools/debian_buildenv.sh setup
       - name: Create build directory
@@ -156,7 +156,7 @@ jobs:
       - name: "Upload Coverage Report to coveralls.io"
         if: matrix.name == 'coverage'
         continue-on-error: true
-        uses: coverallsapp/github-action@v2.2.3
+        uses: coverallsapp/github-action@v2.3.0
         with:
           flag-name: ubuntu-22.04
           path-to-lcov: build/lcov.info

.github/workflows/build.yml

@@ -48,8 +48,8 @@ jobs:
               -DMODPLUG=ON
               -DQT6=ON
               -DWAVPACK=ON
-              -DVCPKG_TARGET_TRIPLET=x64-osx-min1015-release
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
+              -DVCPKG_TARGET_TRIPLET=x64-osx-min1100-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release
             # TODO: Fix this broken test on macOS
             ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory
             cpack_generator: DragNDrop
@@ -73,7 +73,7 @@ jobs:
               -DQT6=ON
               -DWAVPACK=ON
               -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release
             # TODO: Fix this broken test on macOS
             crosscompile: true
             cpack_generator: DragNDrop
@@ -93,7 +93,7 @@ jobs:
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
             cmake_args: >-
-              -DBULK=OFF
+              -DBULK=ON
               -DFFMPEG=OFF
               -DHSS1394=ON
               -DLOCALECOMPARE=ON
@@ -131,7 +131,7 @@ jobs:
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].1
+        uses: actions/[email protected].6
         with:
           # This is necessary for making `git describe` work.
           fetch-depth: 0
@@ -470,7 +470,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/[email protected].1
+        uses: actions/[email protected].3
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}
@@ -481,10 +481,12 @@ jobs:
     needs: build
     # Always run this job, even if one or more jobs from the `build` jobs
     # fail to allow partial updates of the manifest.
-    if: always()
+    # Don't run it on forks that do not have access to our external
+    # infrastructure, though.
+    if: always() && github.repository == 'mixxxdj/mixxx'
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].1
+        uses: actions/[email protected].6
         with:
           fetch-depth: 0
 

.github/workflows/git.yaml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
       - name: Block Fixup Commit Merge
         uses: 13rac1/[email protected]

.github/workflows/pre-commit.yml

@@ -18,7 +18,7 @@ jobs:
     container: holzhaus/mixxx-ci:20220930
     steps:
       - name: "Check out repository"
-        uses: actions/[email protected].1
+        uses: actions/[email protected].6
         with:
           # Unfortunately we need the whole history and can't use a shallow clone
           # because the Appstream Metadata hook parses the history to find the
@@ -67,14 +67,14 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/[email protected].1
+        uses: actions/[email protected].3
         with:
           name: ${{ env.UPLOAD_PATCH_FILE }}
           path: ${{ env.UPLOAD_PATCH_FILE }}
 
       - name: "Upload pre-commit.log"
         if: failure() && env.UPLOAD_PATCH_FILE == null
-        uses: actions/[email protected].1
+        uses: actions/[email protected].3
         with:
           name: pre-commit.log
           path: /github/home/.cache/pre-commit/pre-commit.log

.pre-commit-config.yaml

@@ -64,7 +64,7 @@ repos:
             "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))",
             --write-changes,
           ]
-        exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
+        exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v8.48.0
     hooks:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:mixxx-dj-software:p:mixxxdj:r:mixxx2-5]
+[o:mixxx-dj-software:p:mixxxdj:r:mixxx2-6]
 file_filter  = res/translations/mixxx_<lang>.ts
 source_file  = res/translations/mixxx.ts
 source_lang  = en