adam/forgejo
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/forgejo.git synced 2026-09-30 06:33:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ci): fix seahaven-bot actor lookup after enqueue

Browse source
This commit is contained in:
Adam Moussa 2026-08-24 12:06:45 -04:00
parent 515d515856
commit 0a5c65fd4c
No known key found for this signature in database
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/auto-merge.yaml vendored
View file

@ -53,7 +53,7 @@ jobs:
} }
enabled_by() { enabled_by() {
pr_json --jq -r '.data.node.autoMergeRequest.enabledBy.login // ""' pr_json --jq '.data.node.autoMergeRequest.enabledBy.login // ""'
} }
armed_as_bot() { armed_as_bot() {
@ -76,6 +76,15 @@ jobs:
fi fi
echo "$out" echo "$out"
if [ "$(in_queue)" = "true" ]; then
echo "in merge queue"
exit 0
fi
if armed_as_bot; then
echo "auto-merge already armed as seahaven-bot"
exit 0
fi
# Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would # Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would
# enqueue without starting merge_group. Do not treat an unknown # enqueue without starting merge_group. Do not treat an unknown
# autoMergeRequest as success. # autoMergeRequest as success.