This is an automated email from the ASF dual-hosted git repository.
Yicong-Huang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 7811115ade ci: push backports with AUTO_MERGE_TOKEN to retrigger
release-branch CI (#4676)
7811115ade is described below
commit 7811115ade6172cf9b7675f223174c54816fe246
Author: Yicong Huang <[email protected]>
AuthorDate: Sat May 2 03:50:53 2026 -0700
ci: push backports with AUTO_MERGE_TOKEN to retrigger release-branch CI
(#4676)
## What changes were proposed in this PR?
In \`.github/workflows/direct-backport-push.yml\`, the
\`push-backports\` job's \`actions/checkout@v5\` step now passes
\`token: \${{ secrets.AUTO_MERGE_TOKEN || secrets.GITHUB_TOKEN }}\`. The
cherry-pick is then pushed to the release branch under the PAT, which
retriggers workflows configured to run on push to release branches.
Without this, the default \`GITHUB_TOKEN\`-authored push is silently
excluded from triggering downstream workflows, so post-merge CI on
backport commits never runs.
Falls back to \`GITHUB_TOKEN\` when the secret is unset, preserving
current behavior on forks without the secret.
## Any related issues, documentation, discussions?
Closes #4673. Follow-up to #4580 (post-merge backport automation) and
#4594 (CI for release branches). Uses the same \`AUTO_MERGE_TOKEN\` PAT
introduced for the AutoQueue stand-in (#4553 / #4672).
## How was this PR tested?
Not yet — exercises only when a PR with a backport label is merged into
\`main\`. After landing and configuring the \`AUTO_MERGE_TOKEN\` repo
secret, plan to:
- [ ] Merge any PR carrying a backport label.
- [ ] Confirm a successful \`Direct Backport Push\` run.
- [ ] Confirm the resulting push on the release branch triggers the
expected post-merge CI run.
If \`AUTO_MERGE_TOKEN\` is not configured, the workflow falls back to
\`GITHUB_TOKEN\` and behavior is unchanged.
## Was this PR authored or co-authored using generative AI tooling?
Generated-by: Claude Opus 4.7 (Claude Code)
Co-authored-by: Yicong Huang <[email protected]>
---
.github/workflows/direct-backport-push.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/direct-backport-push.yml
b/.github/workflows/direct-backport-push.yml
index 4ec6483645..c9fc6b20a1 100644
--- a/.github/workflows/direct-backport-push.yml
+++ b/.github/workflows/direct-backport-push.yml
@@ -189,6 +189,11 @@ jobs:
uses: actions/checkout@v5
with:
fetch-depth: 0
+ # Use AUTO_MERGE_TOKEN (fine-grained PAT) so the push to the release
+ # branch retriggers workflows on that branch. GITHUB_TOKEN-authored
+ # pushes are excluded from triggering downstream workflows, which
+ # silences post-merge CI on backport commits.
+ token: ${{ secrets.AUTO_MERGE_TOKEN || secrets.GITHUB_TOKEN }}
- name: Cherry-pick merge commit onto target branch
env:
MERGE_SHA: ${{ github.sha }}
