gitops/optimclaw
1
0
Fork 0
mirror of https://github.com/outbackdingo/optimclaw.git synced 2026-08-26 23:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): remove --delete-branch — it closes chained PRs [skip-regression-check]

Browse Source 
Verified in ironclaw-ci-test: when a promotion branch is deleted on
merge, GitHub CLOSES (not retargets) any chained PRs using it as
their base. This silently breaks the promotion chain.

Remove --delete-branch from gh pr merge. Stale promotion branches
will be cleaned up separately.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
Henry Park
2026-03-09 15:04:49 -07:00
co-authored by Claude Sonnet 4.6
parent ab37518008
commit 0e4d50454b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/staging-ci.yml
+4 -3
View File
@@ -404,9 +404,10 @@ jobs:
run: |
if [ -n "$PR_NUMBER" ]; then
echo "Merging promotion PR #${PR_NUMBER}"
# --delete-branch is safe: GitHub auto-retargets any chained PRs
# targeting this branch to the next base (verified in ironclaw-ci-test)
gh pr merge "$PR_NUMBER" --merge --delete-branch
# Do NOT use --delete-branch: deleting a promotion branch closes
# any chained PRs that use it as their base (verified in ironclaw-ci-test).
# Stale promotion branches are cleaned up separately.
gh pr merge "$PR_NUMBER" --merge
echo "merged=true" >> "$GITHUB_OUTPUT"
fi