PHXH
/
unity-mcp
51
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #681 from CoplayDev/fix/sync-beta-no-delete 

fix: prevent main branch deletion in sync_beta step
beta
dsarno 2026-02-03 11:28:23 -08:00 committed by GitHub
parent c21b65efb5 ebe0296b51
commit a8e478a42a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/release.yml vendored
View File

@ -350,7 +350,8 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
# Enable auto-merge (requires repo setting "Allow auto-merge") # 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) # Wait for PR to be merged (poll up to 2 minutes)
for i in {1..24}; do for i in {1..24}; do
STATE=$(gh pr view "$PR_NUMBER" --json state -q '.state') STATE=$(gh pr view "$PR_NUMBER" --json state -q '.state')
@ -362,7 +363,7 @@ jobs:
sleep 5 sleep 5
done done
echo "Sync PR did not merge in time. Attempting direct merge..." 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: publish_docker:
name: Publish Docker image name: Publish Docker image