Skip to content

[batch-release] Step3: Adds github action to create a PR to sync changes on the release branch back to the main branch #10393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[batch-release] Step3: Adds github action to create a PR to sync changes on the release branch back to the main branch #10393

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
198cfc0
Create sync_release_pr.yml
hannah-hyj Nov 6, 2025
d266cdf
Update sync_release_pr.yml
hannah-hyj Nov 6, 2025
8e6cf16
Update sync_release_pr.yml
hannah-hyj Nov 10, 2025
c489f72
Update sync_release_pr.yml
hannah-hyj Nov 17, 2025
7867b31
lint
hannah-hyj Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/sync_release_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Sync Release to Main"

on:
push:
branches:
- 'release'
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Nov 20, 2025

Choose a reason for hiding this comment

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

Wait, I'm confused about the flow again. How can there be a single release branch that multiple packages are doing releases from while still supporting the async PR approval model? The whole point of using a branch for a release is that the branch can be a snapshot of the state that we want to release for a given package version.

@chunhtai is there a diagram or flow chart in a doc somewhere that shows the final plan for how the branches will work?

Copy link
Contributor

@chunhtai chunhtai Nov 20, 2025

Choose a reason for hiding this comment

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

ah, I forgot about the race condition if we use single branch, where the other package may have merged and brought in new changes.

yeah.. in that case you would need separate release branch for each packages. let me revise the doc a bit and update the issues

Copy link
Contributor

@chunhtai chunhtai Nov 20, 2025

Choose a reason for hiding this comment

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

https://docs.google.com/document/d/1jUoFaawutbYsCI5oY3pDP_l-xpv6FhDKlcI1-EoT02s/edit?tab=t.0


jobs:
create_sync_pr:
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
with:
# Fetch all history for all branches
fetch-depth: 0

- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "sync release branch to main"
title: "Sync release branch to main"
body: "This automated PR syncs the changes from the release branch back to the main branch."
branch: release
base: main