diff --git a/.github/workflows/lock-release.yml b/.github/workflows/lock-release.yml index 8b02e74b97b..8b3b9444868 100644 --- a/.github/workflows/lock-release.yml +++ b/.github/workflows/lock-release.yml @@ -82,9 +82,10 @@ jobs: run: | PR_NUMBERS=$(gh pr list -L 100 -R primer/react --state open --json number,baseRefName,autoMergeRequest,reviewDecision -q '.[] | select(.autoMergeRequest != null) | select(.baseRefName == "main") | select(.reviewDecision == "APPROVED") | .number') if [ -n "$PR_NUMBERS" ]; then - echo "Updating $PR_NUMBERS" + echo "Re-enabling auto-merge on $PR_NUMBERS" for pr in $PR_NUMBERS; do - gh pr update-branch -R primer/react "$pr" || echo "Warning: failed to update PR #$pr (likely has conflicts)" + gh pr merge "$pr" -R primer/react --disable-auto || echo "Warning: failed to disable auto-merge on PR #$pr" + gh pr merge "$pr" -R primer/react --auto --squash || echo "Warning: failed to enable auto-merge on PR #$pr" done else echo "No PRs to update."