Merge remote-tracking branch 'mixxx/main' into lib-add-dir-error

.codespellignorelines

@@ -72,3 +72,4 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
         // ALAC/CAF has been added in version 1.0.26
         QStringLiteral("caf"),
 void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
+    // Note(RRyan/Max Linke):

.eslintrc.json

@@ -84,6 +84,7 @@
     "object-curly-spacing": "warn",
     "prefer-const": "warn",
     "prefer-regex-literals": "warn",
+    "prefer-template": "warn",
     "quotes": [ "warn", "double" ],
     "require-atomic-updates": "error",
     "semi": "warn",

.github/labeler.yml

@@ -102,6 +102,12 @@ preferences:
       - any-glob-to-any-file:
           - src/preferences/**
 
+qml:
+  - changed-files:
+      - any-glob-to-any-file:
+          - res/qml/**
+          - src/qml/**
+
 skins:
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/build-checks.yml

@@ -25,7 +25,7 @@ jobs:
     name: ${{ matrix.name }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
       - name: Install build dependencies
         run: tools/debian_buildenv.sh setup
       - name: Create build directory
@@ -114,14 +114,14 @@ jobs:
             ..
         working-directory: build
       - name: Set up problem matcher
-        uses: ammaraskar/gcc-problem-matcher@0.2.0
+        uses: ammaraskar/gcc-problem-matcher@0.3.0
       # Work around https://github.com/actions/runner-images/issues/8659
       - name: "Remove GCC 13 from runner image (workaround)"
         shell: bash
         run: |
           sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
           sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
+          sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going

.github/workflows/build.yml

@@ -48,8 +48,8 @@ jobs:
               -DMODPLUG=ON
               -DQT6=ON
               -DWAVPACK=ON
-              -DVCPKG_TARGET_TRIPLET=x64-osx-min1015
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015
+              -DVCPKG_TARGET_TRIPLET=x64-osx-min1015-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
             # TODO: Fix this broken test on macOS
             ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory
             cpack_generator: DragNDrop
@@ -72,8 +72,8 @@ jobs:
               -DMODPLUG=ON
               -DQT6=ON
               -DWAVPACK=ON
-              -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100
-              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015
+              -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release
             # TODO: Fix this broken test on macOS
             crosscompile: true
             cpack_generator: DragNDrop
@@ -102,13 +102,15 @@ jobs:
               -DMODPLUG=ON
               -DQT6=ON
               -DWAVPACK=ON
+              -DVCPKG_TARGET_TRIPLET=x64-windows-release
+              -DVCPKG_DEFAULT_HOST_TRIPLET=x64-windows-release
             cc: cl
             cxx: cl
             # TODO: Fix these broken tests on Windows
             ctest_args: --exclude-regex '^AutoDJProcessorTest.*$'
             cpack_generator: WIX
             buildenv_basepath: C:\buildenv
-            buildenv_script: tools/windows_release_buildenv.bat
+            buildenv_script: tools/windows_buildenv.bat
             artifacts_name: Windows Installer
             artifacts_path: build/*.msi
             artifacts_slug: windows-win64
@@ -129,7 +131,7 @@ jobs:
       artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           # This is necessary for making `git describe` work.
           fetch-depth: 0
@@ -146,7 +148,7 @@ jobs:
         run: git fetch origin --force --tags
 
       - name: "[macOS] Set up cmake"
-        uses: jwlawson/actions-setup-cmake@v1.14
+        uses: jwlawson/actions-setup-cmake@v2.0
         # Ubuntu 22.04 should use the CMake version from the repos.
         if: runner.os == 'macOS'
         with:
@@ -155,7 +157,7 @@ jobs:
           cmake-version: "3.21.x"
 
       - name: "[Windows] Set up cmake"
-        uses: jwlawson/actions-setup-cmake@v1.14
+        uses: jwlawson/actions-setup-cmake@v2.0
         # Ubuntu 22.04 should use the CMake version from the repos.
         if: runner.os == 'Windows'
         with:
@@ -175,12 +177,11 @@ jobs:
 
       - name: "[macOS/Windows] Get build environment name"
         if: runner.os != 'Linux'
-        id: buildenv_name
         run: ${{ matrix.buildenv_script }} name
 
       - name: "[macOS/Windows] Set up build environment cache"
         if: runner.os != 'Linux'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.buildenv_basepath }}
           key: ${{ runner.os }}-buildenv-${{ env.BUILDENV_NAME }}
@@ -204,16 +205,24 @@ jobs:
           security set-keychain-settings Mixxx.keychain
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
 
-      - name: "Set up build environment"
-        id: buildenv
-        if: matrix.buildenv_script != null
+      - name: "[macOS/Linux] Set up build environment"
+        if: matrix.buildenv_script != null && runner.os != 'Windows'
         run: ${{ matrix.buildenv_script }} setup
         env:
           BUILDENV_BASEPATH: ${{ matrix.buildenv_basepath }}
 
+      - name: "[Windows] Set up build environment"
+        if: matrix.buildenv_script != null && runner.os == 'Windows'
+        # With the cmd shell the ERRORLEVEL is checked
+        shell: cmd
+        run: ${{ matrix.buildenv_script }} setup
+        env:
+          BUILDENV_BASEPATH: ${{ matrix.buildenv_basepath }}
+          BUILDENV_RELEASE: TRUE
+
       - name: "[Ubuntu/macOS] Set up GitHub cache for ccache"
         if: runner.os != 'windows'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.compiler_cache_path }}
           key: ${{ matrix.os }}-${{ matrix.compiler_cache_id }}-${{ github.head_ref }}-${{ github.run_number }}
@@ -258,11 +267,11 @@ jobs:
 
       - name: "[Ubuntu/macOS] Set up gcc/clang problem matcher"
         if: runner.os != 'Windows'
-        uses: ammaraskar/gcc-problem-matcher@0.2.0
+        uses: ammaraskar/gcc-problem-matcher@0.3.0
 
       - name: "[Windows] Set up MSVC problem matcher"
         if: runner.os == 'Windows'
-        uses: ammaraskar/msvc-problem-matcher@0.2.0
+        uses: ammaraskar/msvc-problem-matcher@0.3.0
 
       - name: "Build"
         run: cmake --build . --config RelWithDebInfo
@@ -304,7 +313,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-signing-action@v0.2.22
+        uses: azure/azure-code-signing-action@v0.3.0
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -359,7 +368,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        uses: azure/azure-code-signing-action@v0.2.22
+        uses: azure/azure-code-signing-action@v0.3.0
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -461,7 +470,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}
@@ -475,7 +484,7 @@ jobs:
     if: always()
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 

.github/workflows/changelog.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Get current branch name
         uses: nelonoel/branch-name@v1.0.1
       - name: Start workflow run on manual repository
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         if: env.MIXXXBOT_TOKEN != null
         with:
           token: ${{ env.MIXXXBOT_TOKEN }}

.github/workflows/download_cleanup.yml

@@ -0,0 +1,38 @@
+name: Clean up downloads
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: "Set up SSH Agent"
+        if: env.SSH_PRIVATE_KEY != null
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+          SSH_PRIVATE_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
+          SSH_HOST: downloads-hostgator.mixxx.org
+        run: |
+          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+          ssh-add - <<< "${SSH_PRIVATE_KEY}"
+          mkdir -p "${HOME}/.ssh"
+          ssh-keyscan "${SSH_HOST}" >> "${HOME}/.ssh/known_hosts"
+          echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}" >> "${GITHUB_ENV}"
+
+      - name: Delete obsolete files
+        if: env.SSH_AUTH_SOCK != null
+        run: |
+          mkdir empty_folder
+          echo 1.12 >> include_file.txt
+          echo 1.12/manual >> include_file.txt
+          echo 1.12/manual/* >> include_file.txt
+          echo 1.12/manual/*/html >> include_file.txt
+          echo 1.12/manual/*/html/* >> include_file.txt
+          echo 1.12/manual/*/html/*/* >> include_file.txt
+          rsync --verbose --archive --times --recursive --delete --include-from=include_file.txt --exclude=* "empty_folder/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/snapshots/"
+        env:
+          DESTDIR: public_html/downloads
+          SSH_HOST: downloads-hostgator.mixxx.org
+          SSH_USER: mixxx

.github/workflows/git.yaml

@@ -0,0 +1,12 @@
+name: Git Checks
+
+on: [pull_request]
+
+jobs:
+  block-fixup:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Block Fixup Commit Merge
+        uses: 13rac1/block-fixup-merge-action@v2.0.0

.github/workflows/pre-commit.yml

@@ -18,7 +18,7 @@ jobs:
     container: holzhaus/mixxx-ci:20220930
     steps:
       - name: "Check out repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
         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
@@ -38,7 +38,7 @@ jobs:
           git config --global --list
 
       - name: "Detect code style issues (push)"
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
         if: github.event_name == 'push'
         # There are too many files in the repo that have formatting issues. We'll
         # disable these checks for now when pushing directly (but still run these
@@ -47,7 +47,7 @@ jobs:
           SKIP: clang-format,eslint,no-commit-to-branch
 
       - name: "Detect code style issues (pull_request)"
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
         if: github.event_name == 'pull_request'
         env:
           SKIP: no-commit-to-branch
@@ -67,14 +67,14 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         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/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: pre-commit.log
           path: /github/home/.cache/pre-commit/pre-commit.log

.pre-commit-config.yaml

@@ -62,6 +62,7 @@ repos:
             .codespellignore,
             --ignore-regex,
             "\\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))$
   - repo: https://github.com/pre-commit/mirrors-eslint