mirror of
https://github.com/Sea-Haven-Industries/file-share.git
synced 2026-10-07 01:11:57 +00:00
fix(ci): re-arm auto-merge as seahaven-bot after failed enqueue
This commit is contained in:
parent
a578b31373
commit
2934872266
1 changed files with 3 additions and 0 deletions
3
.github/workflows/auto-merge.yaml
vendored
3
.github/workflows/auto-merge.yaml
vendored
|
|
@ -55,6 +55,9 @@ jobs:
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "$out"
|
echo "$out"
|
||||||
|
# Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would
|
||||||
|
# enqueue without starting merge_group.
|
||||||
|
gh pr merge "$PR" --repo "$REPO" --disable-auto || true
|
||||||
if ! gh pr merge "$PR" --repo "$REPO" --auto; then
|
if ! gh pr merge "$PR" --repo "$REPO" --auto; then
|
||||||
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
|
if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then
|
||||||
echo "auto-merge already enabled"
|
echo "auto-merge already enabled"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue