Skip to content

feat: add automated backporting to release branches#796

Merged
RiskeyL merged 2 commits into
mainfrom
feat/backport-automation
May 27, 2026
Merged

feat: add automated backporting to release branches#796
RiskeyL merged 2 commits into
mainfrom
feat/backport-automation

Conversation

@RiskeyL
Copy link
Copy Markdown
Contributor

@RiskeyL RiskeyL commented May 27, 2026

What

Automated backporting of merged main commits to long-term release/* branches, delivered as PRs.

  • .backportrc.json — shared config for the sorenlouv/backport toolkit. A backport-to-release/<branch> label maps dynamically to that branch, so any release/* works with no list to maintain.
  • .github/workflows/backport.yml — runs sorenlouv/backport-github-action@v12 on PR merge and opens a backport PR per labeled branch. A clean cherry-pick opens the PR automatically; a conflict comments on the source PR instead of opening a broken one.
  • .github/BACKPORT.md — internal runbook for the npx backport CLI (batch backports and finishing conflicts), excluded from the published site.

Why

Optimization changes merge into main and publish immediately, but the release/* snapshot branches need the same fixes. This turns manual cherry-picking into a one-label action (immediate) or a single CLI pass (batch).

Usage

  • Immediate: add backport-to-release/1.14.x (and any other branch labels) to a PR. On merge, a backport PR opens to each.
  • Batch: run npx backport, multi-select the merged PRs and target branches.

Copilot AI review requested due to automatic review settings May 27, 2026 15:54
@dosubot dosubot Bot added size:M This PR changes 30-99 lines, ignoring generated files. enhancement New feature or request labels May 27, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adds automated backporting of merged main PRs to long-term release/* branches using the sorenlouv/backport toolkit. A label-driven workflow opens backport PRs on merge, a shared .backportrc.json maps backport-to-release/<branch> labels dynamically to target branches, and an internal runbook documents both the label-based and CLI-based flows.

Changes:

  • New GitHub Actions workflow that triggers on labeled/closed PRs and runs sorenlouv/backport-github-action@v12 on merge.
  • New .backportrc.json defining the label→branch regex mapping, PR title template, and target PR labels.
  • New internal BACKPORT.md runbook plus .mintignore entries to keep the runbook and config out of the published docs site.

Reviewed changes

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

File Description
.github/workflows/backport.yml Workflow that runs the backport action on merged, labeled PRs.
.backportrc.json Shared backport config: label-to-branch regex mapping and PR title/label settings.
.github/BACKPORT.md Internal runbook for both the label-based workflow and the npx backport CLI.
.mintignore Excludes the runbook and backport config from the published Mintlify site.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/backport.yml
@mintlify
Copy link
Copy Markdown
Contributor

mintlify Bot commented May 27, 2026

Preview deployment for your docs. Learn more about Mintlify Previews.

Project Status Preview Updated (UTC)
dify-core-product 🟢 Ready View Preview May 27, 2026, 4:13 PM

💡 Tip: Enable Workflows to automatically generate PRs for you.

@RiskeyL RiskeyL merged commit b953ec8 into main May 27, 2026
1 check passed
@RiskeyL RiskeyL deleted the feat/backport-automation branch May 27, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants