Skip to content

fix: overwrite existing stable-sync PR instead of skipping successive syncs #264

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

Merged
tommasini merged 2 commits into from
Jun 23, 2026
+10 −8
Merged

fix: overwrite existing stable-sync PR instead of skipping successive syncs #264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c81df
every sync into a given release branch reuses the same branch
tommasini Jun 19, 2026
f8ec994
Merge branch 'main' into chore/sync-existing-sync-branch
tommasini Jun 19, 2026
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
18 changes: 10 additions & 8 deletions .github/scripts/release-branch-sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ If there are conflicts, they will appear in this PR. Resolve them to ensure the
}

# Process a single release branch
# Returns: 0 = PR created, 1 = failed, 2 = skipped
# Returns: 0 = PR created or refreshed, 1 = failed, 2 = skipped
process_release_branch() {
local release_branch=$1
local merged_version=$2
Expand Down Expand Up @@ -213,12 +213,6 @@ process_release_branch() {
# Create sync branch name (replace / with -)
local sync_branch="stable-sync-${release_branch//\//-}"

# Check if a sync PR already exists
if pr_exists "$release_branch" "$sync_branch"; then
log_warning "Sync PR already exists for ${release_branch}, skipping"
return 2
fi

# Check if stable has any new commits compared to the release branch
if ! stable_has_new_commits "$release_branch"; then
log_success "${release_branch} is already up-to-date with stable, no sync needed"
Expand All @@ -237,7 +231,8 @@ process_release_branch() {
# Create sync branch from stable
git checkout -b "$sync_branch" origin/stable

# Push the sync branch (force in case it exists remotely)
# Push the sync branch (force in case it exists remotely). This overwrites the
# remote branch and refreshes any open PR already pointing at it.
log_info "Pushing ${sync_branch}..."
if git push -u origin "$sync_branch" --force; then
log_success "Pushed ${sync_branch}"
Expand All @@ -246,6 +241,13 @@ process_release_branch() {
return 1
fi

# If a sync PR already exists, the force-push above just refreshed it, so we're
# done. Creating a new PR would fail on the duplicate head branch.
if pr_exists "$release_branch" "$sync_branch"; then
log_success "Refreshed existing sync PR for ${release_branch}"
return 0
fi

# Create the PR (stable-sync branch → release branch)
log_info "Creating PR: ${sync_branch} → ${release_branch}"
if create_sync_pr "$release_branch" "$sync_branch"; then
Expand Down