Skip to content

Commit cf83741

Browse files
authored
fix(lock-release): don't fail on PRs with merge conflicts (#7572)
1 parent 75bf4ab commit cf83741

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/lock-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ jobs:
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
8585
echo "Updating $PR_NUMBERS"
86-
echo "$PR_NUMBERS" | xargs -I {} gh pr update-branch -R primer/react {}
86+
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)"
88+
done
8789
else
8890
echo "No PRs to update."
8991
fi

0 commit comments

Comments
 (0)