Skip to content

Rename auto-pr.yml to auto-merge-forward.yml - #26020

Merged
voloagent merged 1 commit into
rel-10.6from
skoc10-patch-3
Aug 19, 2026
Merged

Rename auto-pr.yml to auto-merge-forward.yml#26020
voloagent merged 1 commit into
rel-10.6from
skoc10-patch-3

Conversation

@skoc10

@skoc10 skoc10 commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@skoc10 skoc10 added this to the 10.6-patch milestone Aug 19, 2026
@skoc10
skoc10 requested review from voloagent and a lite review from Copilot August 19, 2026 14:19
@skoc10 skoc10 added the devops label Aug 19, 2026
@voloagent
voloagent merged commit 13c20b0 into rel-10.6 Aug 19, 2026
2 checks passed
@voloagent
voloagent deleted the skoc10-patch-3 branch August 19, 2026 14:19

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR replaces the previous hard-coded auto PR workflow with a generalized “merge-forward” GitHub Actions workflow intended to forward changes across rel-x.y branches (and ultimately into dev).

Changes:

  • Removed the legacy .github/workflows/auto-pr.yml workflow that targeted a specific pair of release branches.
  • Added .github/workflows/auto-merge-forward.yml, which on pushes to rel-* resolves the next forward target (rel-* or dev), creates a forward-merge PR, and (when conflict-free) auto-approves/auto-merges it.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
.github/workflows/auto-pr.yml Removed the older, branch-specific auto-PR workflow.
.github/workflows/auto-merge-forward.yml Added a generalized forward-merge workflow for rel-x.y branches with optional auto-merge behavior.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +1 to +5
name: Auto-merge forward

# Push to a rel-x.y branch opens a merge PR into the next newer rel-* line,
# or into dev when this line is the newest. Merge of that PR retriggers the
# next hop, so a bug-fix on rel-1.0 flows rel-1.0 -> rel-1.1 -> ... -> dev.
Comment on lines +141 to +144
set -euo pipefail
FORWARD_BRANCH="${{ steps.merge.outputs.branch }}"
gh pr review "$FORWARD_BRANCH" --approve
gh pr merge "$FORWARD_BRANCH" --merge --auto --delete-branch
Comment on lines +126 to +132
URL="$(gh pr create \
--base "$TARGET" \
--head "$FORWARD_BRANCH" \
--title "Auto-merge forward ${SOURCE} → ${TARGET}" \
--body "$BODY")"
echo "url=$URL" >> "$GITHUB_OUTPUT"
echo "Created $URL"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants