Merge remote-tracking branch 'upstream/2.3' into soundtouchoffset

mixxxdj · Aug 9, 2023 · dc60346 · dc60346
2 parents 6a22ef0 + 1a9a62b
commit dc60346
Show file tree

Hide file tree

Showing 428 changed files with 73,924 additions and 65,849 deletions.
diff --git a/.codespellignore b/.codespellignore
@@ -2,3 +2,4 @@ crate
 copyable
 doubleclick
 technics
+jus
diff --git a/.gitattributes b/.gitattributes
@@ -26,3 +26,6 @@
 
 # shell scripts will always have LF line endings on checkout.
 *.sh text eol=lf
+
+# Windows batch scripts will always have CRLF line endings.
+*.bat text eol=crlf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,28 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 18.04 (gcc)
-            os: ubuntu-18.04
-            cmake_args: >-
-              -DWARNINGS_FATAL=ON
-              -DBULK=ON
-              -DFAAD=ON
-              -DFFMPEG=OFF
-              -DLOCALECOMPARE=ON
-              -DMAD=ON
-              -DMODPLUG=ON
-              -DWAVPACK=ON
-              -DINSTALL_USER_UDEV_RULES=OFF
-            ctest_args: []
-            compiler_cache: ccache
-            compiler_cache_path: ~/.ccache
-            cpack_generator: DEB
-            buildenv_basepath: /home/runner/buildenv
-            buildenv_script: tools/debian_buildenv.sh
-            artifacts_name: Ubuntu 18.04 DEB
-            artifacts_path: build/*.deb
-            artifacts_slug: ubuntu-bionic
-            qt_qpa_platform: offscreen
           - name: Ubuntu 20.04 (gcc)
             os: ubuntu-20.04
             cmake_args: >-
@@ -159,7 +137,7 @@ jobs:
 
       - name: "[Windows] Set up MSVC Developer Command Prompt"
         if: runner.os == 'Windows'
-        uses: seanmiddleditch/gha-setup-vsdevenv@v3
+        uses: seanmiddleditch/gha-setup-vsdevenv@v4
 
       - name: "[macOS/Windows] Get build environment name"
         if: runner.os != 'Linux'
@@ -329,7 +307,7 @@ jobs:
 
       - name: "[Windows] Sign Package"
         if: runner.os == 'Windows' && env.WINDOWS_CODESIGN_CERTIFICATE_PATH != null && env.WINDOWS_CODESIGN_CERTIFICATE_PASSWORD != null
-        run: signtool sign /f $Env:WINDOWS_CODESIGN_CERTIFICATE_PATH /p $Env:WINDOWS_CODESIGN_CERTIFICATE_PASSWORD *.msi
+        run: signtool sign /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /f $Env:WINDOWS_CODESIGN_CERTIFICATE_PATH /p $Env:WINDOWS_CODESIGN_CERTIFICATE_PASSWORD *.msi
         working-directory: build
 
       - name: "Prepare for deployment"
@@ -418,7 +396,8 @@ jobs:
           echo "C:/Windows/System32;C:/ProgramData/Chocolatey/bin" >> $GITHUB_PATH
 
       - name: "Upload GitHub Actions artifacts"
-        uses: actions/upload-artifact@v3.1.0
+        if: matrix.artifacts_path != null
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -16,11 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/labeler@main
+      # version between v4.0.3 and the one after which has not yet been tagged
+      # at the time of writing
+      - uses: actions/labeler@7012d51fe062f0b1e26e224a3c9fb52598ee3302
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
-
-          # This works around bug https://github.com/actions/labeler/issues/104.
-          # The workaround was proposed here:
-          # https://github.com/wesnoth/wesnoth/commit/958c82d0867568057caaf58356502ec8c87d8366
-          sync-labels: ""
+          sync-labels: false
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -67,11 +67,18 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3.1.2
         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@v3.1.2
+        with:
+          name: pre-commit.log
+          path: /github/home/.cache/pre-commit/pre-commit.log
+
       # AppStream metadata has been generated/updated by a pre-commit hook
       - name: "Validate AppStream metadata"
         if: runner.os == 'Linux'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,14 +33,15 @@ repos:
     rev: v4.3.0
     hooks:
       - id: fix-byte-order-marker
-        exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters)$
+        exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters|UTF-8-BOM.txt)$
       - id: check-case-conflict
       - id: check-json
       - id: check-merge-conflict
       - id: check-xml
       - id: check-yaml
         exclude: ^\.clang-format$
       - id: end-of-file-fixer
+        exclude: ^.*UTF-8-BOM.txt$
       - id: mixed-line-ending
       - id: trailing-whitespace
         exclude: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|mm|proto|vert)$
@@ -142,7 +143,7 @@ repos:
         language: python
         additional_dependencies:
           - beautifulsoup4==4.11.1
-          - lxml==4.9.1
+          - lxml==4.9.3
           - Markdown==3.4.1
         types: [text]
         files: ^(CHANGELOG\.md|res/linux/org\.mixxx\.Mixxx\.metainfo.xml)$
diff --git a/.tx/config b/.tx/config
@@ -1,9 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[mixxxdj.mixxx2-3]
-file_filter = res/translations/mixxx_<lang>.ts
-source_file = res/translations/mixxx.ts
-source_lang = en
+[o:mixxx-dj-software:p:mixxxdj:r:mixxx2-3]
+file_filter  = res/translations/mixxx_<lang>.ts
+source_file  = res/translations/mixxx.ts
+source_lang  = en
+type         = TS
 minimum_perc = 0
-type = TS