From 0f51c339293107e01075e5b1820d33638e3f35d8 Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Mon, 24 Aug 2026 12:06:49 -0400 Subject: [PATCH] fix(ci): fix seahaven-bot actor lookup after enqueue --- .github/workflows/auto-merge.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml index 22f762b..d725fce 100644 --- a/.github/workflows/auto-merge.yaml +++ b/.github/workflows/auto-merge.yaml @@ -53,7 +53,7 @@ jobs: } enabled_by() { - pr_json --jq -r '.data.node.autoMergeRequest.enabledBy.login // ""' + pr_json --jq '.data.node.autoMergeRequest.enabledBy.login // ""' } armed_as_bot() { @@ -76,6 +76,15 @@ jobs: fi 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 # enqueue without starting merge_group. Do not treat an unknown # autoMergeRequest as success.