lukaszraczylo/shared-actions
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/shared-actions.git synced 2026-10-17 05:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(autoupdate): retry the PR merge on a transient GitHub error

Browse Source
This commit is contained in:
lukaszraczylo
2026-10-03 22:58:15 +01:00
parent 26ad486b78
commit b23191de71
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/renovate-autoupdate.yaml
+15 -5
View File
@@ -561,11 +561,21 @@ jobs:
exit 0 exit 0
fi fi
# --match-head-commit refuses to merge anything newer than the commit that was tested. # --match-head-commit refuses to merge anything newer than the commit that was tested.
if ! gh pr merge "$pr" --repo "$GITHUB_REPOSITORY" --squash --delete-branch \ # GitHub answers 5xx now and then; a failed call may still have merged, so check the state before retrying.
--match-head-commit "$HEAD_SHA" \ merged=false
--subject "$SUBJECT" \ for _ in 1 2 3; do
--body "Automated dependency update. All tests passed." \ if gh pr merge "$pr" --repo "$GITHUB_REPOSITORY" --squash --delete-branch \
${ADMIN:+--admin}; then --match-head-commit "$HEAD_SHA" \
--subject "$SUBJECT" \
--body "Automated dependency update. All tests passed." \
${ADMIN:+--admin}; then
merged=true
break
fi
sleep 10
[ "$(gh pr view "$pr" --repo "$GITHUB_REPOSITORY" --json state --jq .state)" = MERGED ] && { merged=true; break; }
done
if [ "$merged" != true ]; then
gh pr close "$pr" --repo "$GITHUB_REPOSITORY" --comment "The tests passed, but GitHub refused the merge. See the workflow run. The next run tries again." gh pr close "$pr" --repo "$GITHUB_REPOSITORY" --comment "The tests passed, but GitHub refused the merge. See the workflow run. The next run tries again."
exit 1 exit 1
fi fi