Skip to content

Fix unfreeze auto merge #7720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
siddharthkp wants to merge 3 commits into
base: main
Choose a base branch
from
+3 −2
Draft

Fix unfreeze auto merge #7720

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86cee25
Revert "lock-release.yml: Use legacy branch protection instead of rul…
siddharthkp Mar 30, 2026
deccf08
fix(release): toggle auto-merge instead of updating branch to avoid e…
siddharthkp Mar 30, 2026
b63a60e
Merge branch 'main' into fix-unfreeze-auto-merge
siddharthkp Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/lock-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading