Merge remote-tracking branch 'upstream/2.5' into main

djantti · Dec 8, 2024 · 67ede1a · 67ede1a
2 parents 8354c8e + 3921734
commit 67ede1a
Show file tree

Hide file tree

Showing 104 changed files with 38,333 additions and 26,402 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,8 +38,8 @@ jobs:
             artifacts_path: build/*.deb
             artifacts_slug: ubuntu-jammy
             qt_qpa_platform: offscreen
-          - name: macOS 12 x64
-            os: macos-12
+          - name: macOS 13 x64
+            os: macos-13
             cmake_args: >-
               -DBULK=ON
               -DCOREAUDIO=ON
@@ -63,8 +63,8 @@ jobs:
             artifacts_path: build/*.dmg
             artifacts_slug: macos-macosintel
             qt_qpa_platform: offscreen
-          - name: macOS 12 arm64
-            os: macos-12
+          - name: macOS 13 arm64
+            os: macos-13
             cmake_args: >-
               -DBULK=ON
               -DCOREAUDIO=ON
@@ -335,8 +335,17 @@ jobs:
 
       - name: "Package"
         if: matrix.cpack_generator != null
-        run: cpack -G ${{ matrix.cpack_generator }} -V
-        working-directory: build
+        # Use retry loop to work around a race condition on macOS causing
+        # 'Resource busy' errors with 'hdiutil'. See
+        # https://github.com/actions/runner-images/issues/7522
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 12
+          retry_wait_seconds: 1
+          command: |
+            cd build
+            cpack -G ${{ matrix.cpack_generator }} -V
 
       - name: "[Ubuntu] Import PPA GPG key"
         if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -51,6 +51,8 @@ jobs:
         if: github.event_name == 'pull_request'
         env:
           SKIP: no-commit-to-branch
+          # https://github.com/paleite/eslint-plugin-diff?tab=readme-ov-file#ci-setup
+          ESLINT_PLUGIN_DIFF_COMMIT: ${{ github.event.pull_request.base.ref }}
         with:
           # HEAD is the not yet integrated PR merge commit +refs/pull/xxxx/merge
           # HEAD^1 is the PR target branch and HEAD^2 is the HEAD of the source branch

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@
 # because it won't prevent catching other, unrelated issues.
 
 # _anlz.h/_pdb.h: Header files generated by Kaitai Struct
-exclude: ^(lib/|src/test/.*data/).*|res/controllers/lodash\.mixxx\.js|res/translations/.*\.ts|src/.*_(anlz|pdb)\.h$
+exclude: ^(lib/|src/test/.*data/).*|res/controllers/lodash\.mixxx\.js|src/.*_(anlz|pdb)\.h$
 minimum_pre_commit_version: 2.21.0
 default_language_version:
   python: python3
@@ -43,10 +43,10 @@ repos:
       - id: check-yaml
         exclude: ^\.clang-format$
       - id: end-of-file-fixer
-        exclude: ^.*UTF-8-BOM.txt$
+        exclude: ^(res/translations/.*\.ts|.*UTF-8-BOM\.txt)$
       - id: mixed-line-ending
       - id: trailing-whitespace
-        exclude: \.(c|cc|cxx|cpp|d.ts|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|mm|proto|vert)$
+        exclude: \.(c|cc|cxx|cpp|ts|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|mm|proto|tsv|vert)$
       - id: no-commit-to-branch
         # protect main and any branch that has a semver-like name
         args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$']
@@ -64,23 +64,25 @@ repos:
             "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))",
             --write-changes,
           ]
-        exclude: ^(packaging/wix/LICENSE.rtf.in|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: v9.14.0
     hooks:
       - id: eslint
         args: [--fix, --report-unused-disable-directives]
         files: \.m?[jt]s$
         types: [file]
+        verbose: true # always show output so we don't swallow warnings
         stages:
           - pre-commit
           - manual
         additional_dependencies:
           - eslint@^9.14.0
+          - "@eslint/js"
+          - typescript-eslint
           - eslint-plugin-jsdoc@^v50.4.3
-          - "@typescript-eslint/eslint-plugin"
-          - "@typescript-eslint/parser"
           - eslint-plugin-diff@^2.0.3
+        exclude: ^res/translations/.*\.ts$
   - repo: local
     hooks:
       - id: clang-format
@@ -170,3 +172,12 @@ repos:
           - Markdown==3.7
         types: [text]
         files: ^(CHANGELOG\.md|res/linux/org\.mixxx\.Mixxx\.metainfo.xml)$
+      - id: ts-source-copy
+        name: ts-source-copy
+        description: "Find translations literally copied from the source language"
+        entry: python tools/ts_source_copy_check.py
+        require_serial: true
+        language: python
+        additional_dependencies:
+          - lxml==5.3.0
+        files: ^(res/translations/.*\.ts)$