Skip to content

Add auto-merge forward workflow and remove legacy PR workflow - #26018

Merged
voloagent merged 1 commit into
rel-10.7from
skoc/auto
Aug 19, 2026
Merged

Add auto-merge forward workflow and remove legacy PR workflow#26018
voloagent merged 1 commit into
rel-10.7from
skoc/auto

Conversation

@skoc10

@skoc10 skoc10 commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Description

Resolves #xxxx (write the related issue number if available)

TODO: Describe what this PR has changed, add screenshot or animated GIF if available, write if it is a breaking change, and how to fix the breaking changes for existing applications if so.

Checklist

  • I fully tested it as developer / designer and created unit / integration tests
  • I documented it (or no need to document or I will create a separate documentation issue)

How to test it?

Please describe how this can be tested by the test engineers if it is not already explicit - or remove this section if no need to description.

@skoc10 skoc10 added this to the 10.7-final milestone Aug 19, 2026
@skoc10
skoc10 requested review from voloagent and a lite review from Copilot August 19, 2026 14:11
@skoc10 skoc10 added the devops label Aug 19, 2026
@voloagent
voloagent merged commit a5a43ec into rel-10.7 Aug 19, 2026
2 checks passed
@voloagent
voloagent deleted the skoc/auto branch August 19, 2026 14:12

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

Introduces a new GitHub Actions workflow to automatically “forward-merge” changes across rel-x.y branches (and ultimately into dev) and removes the previous one-off legacy workflow that only handled dev -> rel-10.7.

Changes:

  • Removed legacy .github/workflows/auto-pr.yml workflow.
  • Added .github/workflows/auto-merge-forward.yml to compute the next forward target (rel-* or dev), create a merge branch, open a PR, and auto-merge when there are no conflicts.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
.github/workflows/auto-pr.yml Deletes the legacy, single-branch auto PR workflow (dev -> rel-10.7).
.github/workflows/auto-merge-forward.yml Adds generalized forward-merge automation across release branches, with conflict detection and optional auto-merge.

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

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
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