ci: run changeset suffix normalizer inside the version: hook (#820) (#822)

The previous attempt added a pre-step that rewrote -ueX.Y suffixes in
.changeset/*.md before invoking changesets/action. That did not work:
changesets/action creates a fresh changeset-release/<branch> branch and
then `git reset --hard`s it to the trigger commit right before running
`changeset version`, wiping any working-tree edits made earlier in the
workflow (observed on run 24817349995).

Move the normalization into the action's `version:` input so it runs
inside the release-branch worktree AFTER the reset, then chains into
`npx changeset version`. The rewrites now survive. The logic is
extracted into .github/scripts/version-with-normalized-suffixes.sh and
is otherwise unchanged: idempotent, skips non-UEx.y branches, leaves
.changeset/README.md alone.

(cherry picked from commit feee263)

Co-authored-by: mcottontensor <80377552+mcottontensor@users.noreply.github.com>

Author: github-actions[bot]

.github/scripts/version-with-normalized-suffixes.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Runs inside the `changesets/action` release-branch worktree as the `version:`
+# command. Normalizes "-ueX.Y" suffixes in changeset files so that changesets
+# authored on master (which reference the current-latest suffix, e.g.
+# "-ue5.7") are accepted on older UE release branches after auto-backport.
+#
+# Using the action's `version:` hook rather than a pre-step is deliberate: the
+# action performs `git reset --hard <sha>` inside a fresh `changeset-release/*`
+# branch right before running this command, which would wipe any working-tree
+# edits made earlier in the workflow.
+#
+# The normalization is idempotent — a branch whose changesets already have the
+# correct suffix is a no-op — and only touches .changeset/*.md (not README).
+# Branches that do not match `UEX.Y` skip the rewrite entirely.
+set -euo pipefail
+
+branch="${GITHUB_REF_NAME:-}"
+if [[ "$branch" =~ ^UE([0-9]+\.[0-9]+)$ ]]; then
+    ver="${BASH_REMATCH[1]}"
+    echo "Normalizing -ue* suffixes in .changeset/*.md to ue${ver}"
+    shopt -s nullglob
+    rewrote=0
+    for f in .changeset/*.md; do
+        [[ "$(basename "$f")" == "README.md" ]] && continue
+        before="$(cat "$f")"
+        after="$(sed -E "s|(-ue)[0-9]+\.[0-9]+|\1${ver}|g" "$f")"
+        if [[ "$before" != "$after" ]]; then
+            printf '%s' "$after" > "$f"
+            echo "  rewrote $f"
+            rewrote=$((rewrote + 1))
+        fi
+    done
+    echo "Normalized ${rewrote} file(s)."
+else
+    echo "Branch '$branch' is not UEx.y; skipping suffix normalization."
+fi
+
+npx changeset version

.github/workflows/changesets-update-changelogs.yml

@@ -29,47 +29,16 @@ jobs:
       - name: Install Dependencies
         run: npm install
 
-      # Changesets authored on master reference the current UE suffix (e.g.
-      # "@epicgames-ps/lib-pixelstreamingfrontend-ue5.7"). Auto-backport copies
-      # those files verbatim onto older UE release branches where the matching
-      # package has a different suffix (e.g. "...-ue5.6", "...-ue5.5"), and the
-      # changesets CLI then fails with:
-      #   Found changeset ... for package ...-ue5.7 which is not in the workspace
-      # Normalize any "-ueX.Y" suffix inside .changeset/*.md to match the branch
-      # this workflow is running on. Idempotent: a no-op when suffixes already
-      # match. The rewrite lives only in the workflow's working tree; the
-      # changesets action consumes and removes these files as part of the
-      # release PR, so nothing needs to be committed back to the branch.
-      - name: Normalize changeset package suffixes to branch version
-        shell: bash
-        run: |
-          set -euo pipefail
-          branch="${{ github.ref_name }}"
-          if [[ ! "$branch" =~ ^UE([0-9]+\.[0-9]+)$ ]]; then
-            echo "Branch '$branch' is not UEx.y; skipping suffix normalization."
-            exit 0
-          fi
-          ver="${BASH_REMATCH[1]}"
-          echo "Normalizing -ue* suffixes in .changeset/*.md to ue${ver}"
-          shopt -s nullglob
-          rewrote=0
-          for f in .changeset/*.md; do
-            [[ "$(basename "$f")" == "README.md" ]] && continue
-            before="$(cat "$f")"
-            after="$(sed -E "s|(-ue)[0-9]+\.[0-9]+|\1${ver}|g" "$f")"
-            if [[ "$before" != "$after" ]]; then
-              printf '%s' "$after" > "$f"
-              echo "  rewrote $f"
-              rewrote=$((rewrote + 1))
-            fi
-          done
-          echo "Normalized ${rewrote} file(s)."
-
+      # The `version:` script below normalizes "-ueX.Y" suffixes in backported
+      # changeset files so the changesets CLI can resolve them against this
+      # branch's workspace. It runs inside the action's release-branch worktree
+      # (after its internal `git reset --hard`) so the rewrites survive.
       - name: Create Release Pull Request
         uses: changesets/action@v1.4.10
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           title: '[Bot] NPM Packages Release ${{ github.ref_name }}'
           commit: 'Updated NPM changelogs'
+          version: bash .github/scripts/version-with-normalized-suffixes.sh