Merge pull request #893 from acolombier/chore/sync-branch-2.5-with-2.6

Merge branch '2.5' into '2.6'

Author: ronso0

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-24.04
     if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         ref: main
         fetch-depth: 0
@@ -43,7 +43,7 @@ jobs:
     name: PDF
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Setup PDF Build Dependencies
       run: >
         sudo apt-get update && sudo apt-get install -y

.github/workflows/changelog.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Event Information
       run: echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}'"
     - name: Check out repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         ref: ${{ github.event.client_payload.branch }}
     - name: Set up Python
@@ -34,10 +34,9 @@ jobs:
       run: tools/update_changelog.py -b "${{ github.event.client_payload.branch }}"
     - name: Check if changes any changes were made
       run: echo "GIT_DIRTY=$(git diff --quiet ; printf "%d" "$?")" >> "${GITHUB_ENV}"
-    - uses: EndBug/add-and-commit@v9
+    - uses: EndBug/add-and-commit@v10
       if: env.GIT_DIRTY != null && env.GIT_DIRTY != '0'
       with:
-        branch: ${{ github.event.client_payload.branch }}
         add: "source/chapters/appendix/changelog.rst"
         message: "appendix/changelog: Update changelog for ${{ github.event.client_payload.branch }} branch"
         author_name: mixxxbot

.github/workflows/pre-commit.yml

@@ -8,23 +8,39 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
-    - uses: actions/setup-python@v6
-    - uses: pre-commit/action@v3.0.1
-      env:
-        SKIP: rstcheck
+      - name: "Check out repository"
+        uses: actions/checkout@v7
+        with:
+          # Fetch the previous commit to be able to check for changes
+          fetch-depth: 2
 
-    - name: "Generate patch file"
-      if: failure()
-      run: |
-        git diff-index -p HEAD > "${PATCH_FILE}"
-        [ -s "${PATCH_FILE}" ] && echo "UPLOAD_PATCH_FILE=${PATCH_FILE}" >> "${GITHUB_ENV}"
-      env:
-        PATCH_FILE: pre-commit.patch
+      - name: "Detect code style issues (push)"
+        uses: pre-commit/action@v3.0.1
+        if: github.event_name == 'push'
+        env:
+          SKIP: rstcheck,ignore-pot-creation-date
 
-    - name: "Upload patch artifact"
-      if: failure() && env.UPLOAD_PATCH_FILE != null
-      uses: actions/upload-artifact@v6
-      with:
-        name: ${{ env.UPLOAD_PATCH_FILE }}
-        path: ${{ env.UPLOAD_PATCH_FILE }}
+      - name: "Detect code style issues (pull_request)"
+        uses: pre-commit/action@v3.0.1
+        if: github.event_name == 'pull_request'
+        env:
+          SKIP: rstcheck
+        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
+          extra_args: --from-ref HEAD^1 --to-ref HEAD
+
+      - name: "Generate patch file"
+        if: failure()
+        run: |
+          git diff-index -p HEAD > "${PATCH_FILE}"
+          [ -s "${PATCH_FILE}" ] && echo "UPLOAD_PATCH_FILE=${PATCH_FILE}" >> "${GITHUB_ENV}"
+        env:
+          PATCH_FILE: pre-commit.patch
+
+      - name: "Upload patch artifact"
+        if: failure() && env.UPLOAD_PATCH_FILE != null
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.UPLOAD_PATCH_FILE }}
+          path: ${{ env.UPLOAD_PATCH_FILE }}

.github/workflows/sphinx.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
     - name: Set up Graphviz
       run: sudo apt update && sudo apt install -y graphviz
     - name: Set up Python

.pre-commit-config.yaml

@@ -15,12 +15,18 @@ repos:
     types: [rst]
     entry: python tools/fixup_gh_wiki_anchors.py
     language: python
+  - id: ignore-pot-creation-date
+    name: Ignore POT-Creation-Date
+    entry: python tools/ignore_pot_creation_date.py
+    language: python
+    files: ^.*\.po$
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v5.0.0
   hooks:
   - id: check-byte-order-marker
   - id: check-case-conflict
   - id: end-of-file-fixer
+    exclude: ^\.tx/config$
   - id: mixed-line-ending
   - id: trailing-whitespace
     exclude: ^source/locale/.*$

.tx/config

@@ -1750,3 +1750,4 @@ minimum_perc           = 0
 resource_name          = sphinx
 replace_edited_strings = false
 keep_translations      = false
+