Skip to content

ci: add sync release branches composite action [ED-25426] - #51

Merged
davseve merged 4 commits into
elementor:mainfrom
davseve:ci/ED-25426-cherry-pick-release-branches
Aug 31, 2026
Merged

ci: add sync release branches composite action [ED-25426]#51
davseve merged 4 commits into
elementor:mainfrom
davseve:ci/ED-25426-cherry-pick-release-branches

Conversation

@davseve

@davseve davseve commented Aug 30, 2026

Copy link
Copy Markdown
Member

Summary

  • Adds reusable composite action actions/sync-release-branches for the new release branch model
  • When a PR merges into a release branch, automatically opens downstream PRs using isolated git worktrees:
    • release/stable → PRs to release/beta and main
    • release/beta → PR to main
  • Merges the source merge commit into sync-pr<#>_to_<target> branches (no cherry-pick)
  • Reuses the original PR title for downstream PRs
  • Creates draft conflict PRs when merge fails

Test plan

  • Merge this PR to main
  • Merge companion PRs in elementor and elementor-pro
  • Merge a test PR to release/stable and verify sync PRs open for release/beta and main
  • Merge a test PR to release/beta and verify sync PR opens for main
  • Confirm sync-pr* head branches do not re-trigger the cascade

Jira

ED-25426

Add reusable composite action that cherry-picks merged PRs across
release/stable, release/beta, and main using isolated git worktrees.

Ref: ED-25426
Co-authored-by: Cursor <cursoragent@cursor.com>
@davseve davseve changed the title CI: Add cherry-pick release branches composite action [ED-25426] ci: add cherry-pick release branches composite action [ED-25426] Aug 30, 2026
davseve and others added 3 commits August 30, 2026 15:55
Ref: ED-25426
Co-authored-by: Cursor <cursoragent@cursor.com>
Merge the merged commit into sync branches and open normal PRs with
the original title instead of cherry-pick PRs.

Ref: ED-25426
Co-authored-by: Cursor <cursoragent@cursor.com>
Ref: ED-25426
Co-authored-by: Cursor <cursoragent@cursor.com>
@davseve davseve changed the title ci: add cherry-pick release branches composite action [ED-25426] CI: Add sync release branches composite action [ED-25426] Aug 30, 2026
@davseve davseve changed the title CI: Add sync release branches composite action [ED-25426] ci: add sync release branches composite action [ED-25426] Aug 30, 2026
davseve added a commit to elementor/elementor that referenced this pull request Aug 31, 2026
## Summary
- Adds `.github/workflows/sync-release-branches.yml` for the new release
branch model
- On merge to `release/stable`, automatically opens PRs to
`release/beta` and `main`
- On merge to `release/beta`, automatically opens a PR to `main`
- Uses shared action
`elementor/elementor-editor-github-actions/actions/sync-release-branches@main`
- Skips PRs whose head branch starts with `sync-pr` to prevent cascade
loops

## Test plan
- [ ] Merge elementor/elementor-editor-github-actions#51 first
- [ ] Merge this PR
- [ ] Merge a test PR to `release/stable` and verify sync PRs are
created for `release/beta` and `main`
- [ ] Merge a test PR to `release/beta` and verify sync PR to `main`
- [ ] Verify auto-generated `sync-pr*` PRs do not re-trigger the
workflow

## Jira
ED-25426
<!--start_gitstream_placeholder-->
### ✨ PR Description
## 1. Problem & Context

Automates cherry-pick propagation from stable/beta release branches to
downstream branches, reducing manual sync overhead post-merge
(ED-25426).

## 2. What Changed (Where)

- `.github/workflows/sync-release-branches.yml`: New workflow triggering
on merged PRs to release/stable and release/beta branches.

## 3. How It Works

Workflow fires on PR merge to release branches (excluding sync-pr
prefixed branches), logs merge metadata, then delegates cherry-pick
logic to `elementor-editor-github-actions/sync-release-branches` action,
passing PR context and authentication.

## 4. Risks

Depends on external action stability and correct `GH_PAT` secret
configuration; failed syncs won't block original merges but could
silently drop cherry-picks if action fails silently.

_Generated by LinearB AI and added by gitStream._
<sub>AI-generated content may contain inaccuracies. Please verify before
using.
💡 **Tip:** You can customize your AI Description using **Guidelines**
[Learn
how](https://docs.gitstream.cm/automation-actions/#describe-changes)</sub>
<!--end_gitstream_placeholder-->

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Svitlana-Dykun <svitlanad@elementor.red>
Co-authored-by: ElementorBot <48412871+elementorbot@users.noreply.github.com>
@davseve
davseve merged commit 81dac7f into elementor:main Aug 31, 2026
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants