Skip to content

Commit deccf08

Browse files
committed
fix(release): toggle auto-merge instead of updating branch to avoid extra CI
1 parent 86cee25 commit deccf08

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/lock-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ jobs:
8282
run: |
8383
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')
8484
if [ -n "$PR_NUMBERS" ]; then
85-
echo "Updating $PR_NUMBERS"
85+
echo "Re-enabling auto-merge on $PR_NUMBERS"
8686
for pr in $PR_NUMBERS; do
87-
gh pr update-branch -R primer/react "$pr" || echo "Warning: failed to update PR #$pr (likely has conflicts)"
87+
gh pr merge "$pr" -R primer/react --disable-auto || echo "Warning: failed to disable auto-merge on PR #$pr"
88+
gh pr merge "$pr" -R primer/react --auto --squash || echo "Warning: failed to enable auto-merge on PR #$pr"
8889
done
8990
else
9091
echo "No PRs to update."

0 commit comments

Comments
 (0)