fix(infra): Backport of patch release changelog to main (#4618)

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>
Co-authored-by: Aaron Abbott <aaronabbott@google.com>

Author: emdneto

.github/workflows/prepare-patch-release.yml

@@ -110,6 +110,7 @@ jobs:
         run: .github/scripts/use-cla-approved-github-bot.sh
 
       - name: Backport patch release changelog to main
+        id: backport_pr
         env:
           GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
@@ -121,11 +122,19 @@ jobs:
           git fetch origin $release_branch
 
           # Copy the updated CHANGELOG.md from the release branch
-          git checkout $release_branch -- CHANGELOG.md
+          git checkout FETCH_HEAD -- CHANGELOG.md
           git commit -m "$message"
 
           git push origin HEAD:$branch
-          gh pr create --title "$message" \
-                       --body "$body" \
-                       --head $branch \
-                       --base main
+          pr_url=$(gh pr create --title "$message" \
+                                --body "$body" \
+                                --head $branch \
+                                --base main)
+          echo "pr_url=$pr_url" >> $GITHUB_OUTPUT
+
+      - name: Add Skip Changelog label to backport PR
+        if: steps.backport_pr.outputs.pr_url != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr edit ${{ steps.backport_pr.outputs.pr_url }} --add-label "Skip Changelog"

.github/workflows/prepare-release-branch.yml

@@ -227,4 +227,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh pr edit ${{ steps.create_main_pr.outputs.pr_url }}  --add-label "prepare-release"
+          gh pr edit ${{ steps.create_main_pr.outputs.pr_url }}  --add-label "prepare-release" --add-label "Skip Changelog"

CHANGELOG.md

@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- changelog start -->
 
+## Version 1.42.1/0.63b1 (2026-05-21)
+
+No significant changes.
+
 ## Version 1.42.0/0.63b0 (2026-05-19)
 
 ### Added