ci: retry dependabot merge when state is pending
This commit is contained in:
1 parent
68ec8bfbcf
commit
a1a9c45ad8
1 file changed
+6
-2
@@ -101,7 +101,7 @@ jobs:
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$merge_state" == "DIRTY" || "$merge_state" == "UNKNOWN" ]]; then
|
if [[ "$merge_state" == "DIRTY" ]]; then
|
||||||
echo "Skipping PR #$pr because merge state is $merge_state."
|
echo "Skipping PR #$pr because merge state is $merge_state."
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
@@ -127,5 +127,9 @@ jobs:
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gh pr merge "$pr" --merge --delete-branch --match-head-commit "$head_sha"
|
if gh pr merge "$pr" --merge --delete-branch --match-head-commit "$head_sha"; then
|
||||||
|
echo "Merged PR #$pr."
|
||||||
|
else
|
||||||
|
echo "Could not merge PR #$pr; it will be retried on the next scheduled run."
|
||||||
|
fi
|
||||||
done <<< "$PRS"
|
done <<< "$PRS"
|
||||||
Reference in new issue
Block a user