From ebe0296b51c92b79df94f8850834b5f053afd854 Mon Sep 17 00:00:00 2001 From: dsarno Date: Tue, 3 Feb 2026 11:18:17 -0800 Subject: [PATCH] fix: prevent main branch deletion in sync_beta step Added --no-delete-branch flag to gh pr merge commands in the sync_beta job. This prevents GitHub's auto-delete feature from removing the main branch when the sync PR (main -> beta) merges. Co-Authored-By: Claude Opus 4.5 --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33e3773..73d8288 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -350,7 +350,8 @@ jobs: run: | set -euo pipefail # Enable auto-merge (requires repo setting "Allow auto-merge") - gh pr merge "$PR_NUMBER" --merge --auto || true + # Use --no-delete-branch to prevent deleting main (the head branch) + gh pr merge "$PR_NUMBER" --merge --auto --no-delete-branch || true # Wait for PR to be merged (poll up to 2 minutes) for i in {1..24}; do STATE=$(gh pr view "$PR_NUMBER" --json state -q '.state') @@ -362,7 +363,7 @@ jobs: sleep 5 done echo "Sync PR did not merge in time. Attempting direct merge..." - gh pr merge "$PR_NUMBER" --merge + gh pr merge "$PR_NUMBER" --merge --no-delete-branch publish_docker: name: Publish Docker image