Hid learning wizard gui

.github/workflows/build-checks.yml

@@ -5,6 +5,7 @@ name: build-checks
 on:
   push:
   pull_request:
+    types: [opened, synchronize, reopened, edited]
 
 permissions:
   contents: read #  to fetch code (actions/checkout)

.github/workflows/build.yml

@@ -5,6 +5,7 @@ name: Build
 on:
   push:
   pull_request:
+    types: [opened, synchronize, reopened, edited]
 
 permissions:
   contents: read #  to fetch code (actions/checkout)
@@ -88,15 +89,13 @@ jobs:
             artifacts_path: build/*.dmg
             artifacts_slug: macos-macosarm
             qt_qpa_platform: offscreen
-          - name: Windows 2019 (MSVC)
-            os: windows-2019
-            # TODO: Re-enable FFmpeg after licensing issues have been clarified
+          - name: Windows 2022 (MSVC)
+            os: windows-2022
             # Attention: If you change the cmake_args for the Windows CI build,
             #            also adjust the for the local Windows build setup in
             #            ./tools/windows_buildenv.bat
             cmake_args: >-
               -DBULK=ON
-              -DFFMPEG=OFF
               -DHSS1394=ON
               -DLOCALECOMPARE=ON
               -DMAD=ON
@@ -175,7 +174,7 @@ jobs:
       - name: "[macOS] install ccache and make"
         if: runner.os == 'macOS'
         run: |
-          brew install ccache ninja
+          brew install ccache
 
       - name: "[macOS/Windows] Get build environment name"
         if: runner.os != 'Linux'
@@ -492,7 +491,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/upload-artifact@v4.6.1
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}

.github/workflows/pre-commit.yml

@@ -69,14 +69,14 @@ jobs:
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v4.6.1
+        uses: actions/upload-artifact@v4.6.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@v4.6.1
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: pre-commit.log
           path: /github/home/.cache/pre-commit/pre-commit.log

.github/workflows/sync_branches.yml

@@ -1,13 +1,19 @@
 name: Sync Branches
 on:
   push:
-    branches:
-      - "2.4"
-      - "2.5"
+    #    branches:
+    #      - "2.4"
+    #      - "2.5"
+    #   temporary disabled for all branches
+    branches-ignore:
+      - "*"
   workflow_dispatch:
 
 permissions: {}
 
+env:
+  SYNC_COMMITTER_EMAIL: bot@mixxx.org
+  SYNC_COMMITTER_NAME: Mixxx Bot
 jobs:
   sync-branches:
     strategy:
@@ -21,12 +27,25 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    env:
-      SYNC_COMMITTER: github-actions[bot]
     steps:
+      # Using an app is the recommended way to allow recursive operations.
+      # Apps offer a way to have reduced scoped permissions (like GITHUB_TOKEN)
+      # and short lifespan, unlike PAT.
+      # As we are trialing this approach tho, it is fine to play with a PAT and not spend the
+      # extra time setting up an app
+      #
+      # - name: Generate App Token
+      #   id: generate-token-key-pair
+      #   uses: actions/create-github-app-token@v1
+      #   with:
+      #     private-key: ${{ secrets.MIXXX_BOT_APP_PRIVATE_KEY }}
+      #     app-id: ${{ vars.MIXXX_BOT_APP_ID }}
+
       - name: "Check out repository"
         uses: actions/checkout@v4.1.7
         with:
+          # PAT setup with content:write and pull_request:write
+          token: ${{ secrets.MIXXX_BRANCH_SYNC_PAT }}
           persist-credentials: true
 
       - name: "Configure Git"
@@ -39,12 +58,12 @@ jobs:
         run: |
           if git fetch origin "${SYNC_BRANCH}"; then
             echo "Branch ${SYNC_BRANCH} already exists, checking if the branch was modified..."
-            COMMITTER="$(git show --pretty=format:"%cn <%ce>" --no-patch "origin/${SYNC_BRANCH}")"
-            if [ "${COMMITTER}" = "${SYNC_COMMITTER}" ]; then
-              echo "Branch ${SYNC_BRANCH} was not modified."
+            echo "branch_exists=true" >> $GITHUB_OUTPUT
+            COMMITTER_EMAIL="$(git show --pretty=format:"%ce" --no-patch "origin/${SYNC_BRANCH}")"
+            if [ "${COMMITTER_EMAIL}" = "${SYNC_COMMITTER_EMAIL}" ]; then
+              echo "Branch ${SYNC_BRANCH} was NOT modified."
             else
-              echo "Branch ${SYNC_BRANCH} was modified, either delete it or update it yourself."
-              echo "skip_sync=true" >> $GITHUB_OUTPUT
+              echo "Branch ${SYNC_BRANCH} was modified."
             fi
           else
             echo "Branch ${SYNC_BRANCH} does not exist yet."
@@ -53,26 +72,38 @@ jobs:
           SYNC_BRANCH: sync-branch-${{ matrix.from_branch}}-to-${{ matrix.to_branch }}
 
       - name: "Merge Changes"
-        if: steps.check_sync.outputs.skip_sync != 'true'
         run: |
-          git checkout -b "${SYNC_BRANCH}"
-          git fetch origin "${TO_BRANCH}"
-          git reset --hard "origin/${TO_BRANCH}"
-          git pull --no-edit origin "${FROM_BRANCH}"
+          echo "::group::Fetching and merging branches"
+          if [ "${BRANCH_EXISTS}" = true ]; then
+            git fetch origin "${SYNC_BRANCH}" "${FROM_BRANCH}"
+            git checkout "${SYNC_BRANCH}"
+          else
+            git fetch origin "${TO_BRANCH}" "${FROM_BRANCH}"
+            git checkout "origin/${TO_BRANCH}"
+            git checkout -b "${SYNC_BRANCH}"
+          fi
+          git config --global user.email "${SYNC_COMMITTER_EMAIL}"
+          git config --global user.name "${SYNC_COMMITTER_NAME}"
+          git pull --no-edit origin "${FROM_BRANCH}" || true
           COMMIT_ORIGINAL="$(git show --no-patch --format="%h" "origin/${TO_BRANCH}")"
-          COMMIT_MERGE="$(git show --no-patch --format="%h" "origin/${TO_BRANCH}")"
+          COMMIT_MERGE="$(git show --no-patch --format="%h" "origin/${SYNC_BRANCH}")"
+          git status
+          echo "::endgroup::"
           if [ "${COMMIT_ORIGINAL}" = "${COMMIT_MERGE}" ]; then
-            git status
-            echo "No changes (or merge conflict), skipping push and PR creation."
+            echo "::warning:: No changes (or merge conflict), skipping push and PR creation."
           else
-            git push --force origin "${SYNC_BRANCH}"
-            gh pr create -B "${FROM_BRANCH}" -H "${SYNC_BRANCH}" --title "${PULL_REQUEST_TITLE}" --body "${PULL_REQUEST_BODY}" --labels "sync-branches"
+            git push origin "${SYNC_BRANCH}"
+            if [ ! "${BRANCH_EXISTS}" = true ]; then
+              gh pr create -B "${FROM_BRANCH}" -H "${SYNC_BRANCH}" --title "${PULL_REQUEST_TITLE}" --body "${PULL_REQUEST_BODY}" --labels "sync-branches"
+            fi
           fi
         env:
+          BRANCH_EXISTS: ${{ steps.check_sync.outputs.branch_exists }}
           FROM_BRANCH: ${{ matrix.from_branch}}
           TO_BRANCH: ${{ matrix.to_branch }}
           SYNC_BRANCH: sync-branch-${{ matrix.from_branch}}-to-${{ matrix.to_branch }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # PAT setup with content:write and pull_request:write
+          GITHUB_TOKEN: ${{ secrets.MIXXX_BRANCH_SYNC_PAT }}
           PULL_REQUEST_TITLE: Merge changes from `${{ matrix.from_branch }}` into `${{ matrix.to_branch }}`
           PULL_REQUEST_BODY: |
             New content has landed in the `${{ matrix.from_branch }}` branch, so let's merge the changes into `${{ matrix.to_branch }}`.

.tx/config

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