Skip to content

fix(ci): preserve PR author on backport commits #4614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yicong-Huang merged 3 commits into from
May 1, 2026
Merged

fix(ci): preserve PR author on backport commits #4614

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e657b
fix(ci): preserve PR author on backport commits
Yicong-Huang May 1, 2026
a6e2de5
fix(ci): reuse the squash commit's message to preserve co-authors
Yicong-Huang May 1, 2026
a51bcea
fix(ci): label the trailer as backported instead of cherry picked
Yicong-Huang May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions .github/workflows/direct-backport-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ jobs:
env:
MERGE_SHA: ${{ github.sha }}
TARGET_BRANCH: ${{ matrix.target }}
PR_NUMBER: ${{ needs.discover.outputs.pr_number }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
set -euo pipefail

Expand All @@ -151,19 +149,19 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

pr_title=$(gh pr view "${PR_NUMBER}" --json title --jq .title)
pr_body=$(gh pr view "${PR_NUMBER}" --json body --jq .body)
# Reuse the squash commit's full message so the PR title, description,
# and any Co-Authored-By trailers GitHub injected stay attached to
# the backport commit. The author is the squash commit's author
# (the original PR author for squash merges).
original_author=$(git log -1 --format='%an <%ae>' "${MERGE_SHA}")
merge_message=$(git log -1 --format=%B "${MERGE_SHA}")

git fetch --no-tags origin "${TARGET_BRANCH}"
git checkout -B "${TARGET_BRANCH}" "origin/${TARGET_BRANCH}"
git cherry-pick --no-commit "${MERGE_SHA}"

{
printf '%s (#%s)\n\n' "${pr_title}" "${PR_NUMBER}"
if [[ -n "${pr_body}" ]]; then
printf '%s\n\n' "${pr_body}"
fi
printf '(cherry picked from commit %s)\n' "${MERGE_SHA}"
} | git commit -F -
printf '%s\n\n(backported from commit %s)\n' "${merge_message}" "${MERGE_SHA}"
} | git commit -F - --author="${original_author}"

git push origin "HEAD:${TARGET_BRANCH}"
Loading