privilegedescalation/org
12
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(release): improve merge error handling to handle already-merged PRs (#76)

Browse Source 
Check PR state before attempting merge to avoid 'branch not found' errors
when a prior run's auto-merge already completed. Fallback merge should
now handle all cases without spurious step failures.

Fixes: https://github.com/privilegedescalation/.github/issues/75

Co-authored-by: Hugh Hackman <hugh@privilegedescalation.github>
Co-authored-by: Paperclip <noreply@paperclip.ing>
This commit is contained in:
privilegedescalation-engineer[bot]
2026-03-25 07:29:17 +00:00
committed by GitHub
parent ccc4859d0e
commit 4540a22dfe
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/plugin-release.yaml
+6 -2
View File
@@ -277,8 +277,12 @@ jobs:
# Try auto-merge first (works on repos with required status checks pending).
# Fall back to direct squash merge on repos without required status checks
# (auto-merge is rejected when there are no pending required checks to wait for).
if ! gh pr merge "release/v${VERSION}" --auto --squash --delete-branch 2>/dev/null; then
echo "Auto-merge not available (no pending required status checks). Falling back to direct squash merge."
# If PR is already merged, skip entirely to avoid "branch not found" errors.
PR_STATE=$(gh pr view "release/v${VERSION}" --json state --jq '.state' 2>/dev/null || echo "unknown")
if [ "$PR_STATE" = "MERGED" ]; then
echo "PR release/v${VERSION} is already merged. Skipping merge step."
elif ! gh pr merge "release/v${VERSION}" --auto --squash --delete-branch 2>&1; then
echo "Auto-merge not available (no pending required status checks or other constraint). Falling back to direct squash merge."
gh pr merge "release/v${VERSION}" --squash --delete-branch
fi
env: