From 0e4d50454b2fb43bcbbdb5d19f0faa9c846bd6d0 Mon Sep 17 00:00:00 2001 From: Henry Park Date: Mon, 9 Mar 2026 15:04:49 -0700 Subject: [PATCH] =?UTF-8?q?fix(ci):=20remove=20--delete-branch=20=E2=80=94?= =?UTF-8?q?=20it=20closes=20chained=20PRs=20[skip-regression-check]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .github/workflows/staging-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/staging-ci.yml b/.github/workflows/staging-ci.yml index 43244447..6d72f0bd 100644 --- a/.github/workflows/staging-ci.yml +++ b/.github/workflows/staging-ci.yml @@ -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