From 7d079536e523e448ad583fb83633e56602bad61d Mon Sep 17 00:00:00 2001 From: AztecBot Date: Fri, 24 Jul 2026 14:24:26 +0000 Subject: [PATCH 1/2] chore(ci): route spartan/spartan-v5 merge-train notifications to #team-alpha-ci --- .github/workflows/merge-train-stale-check.yml | 4 ++-- .github/workflows/network-healthcheck.yml | 4 ++-- ci3/merge_train_failure_slack_notify | 4 ++-- ci3/merge_train_stale_check | 2 +- scripts/socket-fix-ci.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge-train-stale-check.yml b/.github/workflows/merge-train-stale-check.yml index 6474cf137dd7..f45e462f92df 100644 --- a/.github/workflows/merge-train-stale-check.yml +++ b/.github/workflows/merge-train-stale-check.yml @@ -20,7 +20,7 @@ jobs: env: GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} - run: ./ci3/merge_train_stale_check merge-train/spartan '#team-alpha' + run: ./ci3/merge_train_stale_check merge-train/spartan '#team-alpha-ci' spartan-v5: name: Check merge-train/spartan-v5 @@ -36,7 +36,7 @@ jobs: GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} BASE_BRANCH: v5-next - run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha' + run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha-ci' fairies-v5: name: Check merge-train/fairies-v5 diff --git a/.github/workflows/network-healthcheck.yml b/.github/workflows/network-healthcheck.yml index 7347e74d1387..4cb2252ed750 100644 --- a/.github/workflows/network-healthcheck.yml +++ b/.github/workflows/network-healthcheck.yml @@ -37,7 +37,7 @@ jobs: 5. Any errors (level >= 50) or warnings (level 40) in the last 8 hours 6. Bot status if applicable - Create a gist with the full healthcheck report. Then post a concise summary to the #team-alpha channel via respond_to_user. Flag anything that needs attention (stopped bots, missed slots, errors, low peer counts). + Create a gist with the full healthcheck report. Then post a concise summary to the #team-alpha-ci channel via respond_to_user. Flag anything that needs attention (stopped bots, missed slots, errors, low peer counts). Format the respond_to_user message as a brief network status overview, e.g.: - testnet: healthy, block 5570, 100 peers @@ -45,6 +45,6 @@ jobs: - devnet: WARNING - bot stopped (insufficient balance) Link to the gist for full details." - ./ci3/slack_notify_with_claudebox_kickoff "#team-alpha" \ + ./ci3/slack_notify_with_claudebox_kickoff "#team-alpha-ci" \ "Starting network healthcheck for: ${NETWORKS}" \ "$PROMPT" diff --git a/ci3/merge_train_failure_slack_notify b/ci3/merge_train_failure_slack_notify index 43259dc434bb..540f0ed52b53 100755 --- a/ci3/merge_train_failure_slack_notify +++ b/ci3/merge_train_failure_slack_notify @@ -36,9 +36,9 @@ elif [[ "$REF_NAME" == "merge-train/fairies" ]]; then elif [[ "$REF_NAME" == "merge-train/fairies-v5" ]]; then channel="#team-fairies" elif [[ "$REF_NAME" == "merge-train/spartan" ]]; then - channel="#team-alpha" + channel="#team-alpha-ci" elif [[ "$REF_NAME" == "merge-train/spartan-v5" ]]; then - channel="#team-alpha" + channel="#team-alpha-ci" else exit 0 fi diff --git a/ci3/merge_train_stale_check b/ci3/merge_train_stale_check index a65c6ef9d985..b31989c0015f 100755 --- a/ci3/merge_train_stale_check +++ b/ci3/merge_train_stale_check @@ -6,7 +6,7 @@ # Usage: merge_train_stale_check # # Example: -# merge_train_stale_check merge-train/spartan '#team-alpha' +# merge_train_stale_check merge-train/spartan '#team-alpha-ci' # # Required env vars: # GH_TOKEN — GitHub API token (used by `gh api`) diff --git a/scripts/socket-fix-ci.sh b/scripts/socket-fix-ci.sh index 86f22c40591d..2e77d48e85c4 100755 --- a/scripts/socket-fix-ci.sh +++ b/scripts/socket-fix-ci.sh @@ -122,7 +122,7 @@ ${LINKS}" ${LINKS}" fi - data=$(jq -n --arg channel "#team-alpha" --arg text "$TEXT" '{channel: $channel, text: $text}') + data=$(jq -n --arg channel "#team-alpha-ci" --arg text "$TEXT" '{channel: $channel, text: $text}') curl -X POST https://slack.com/api/chat.postMessage \ -H "Authorization: Bearer $SLACK_BOT_TOKEN" \ From 1c87f3cf0fe9552a66f19c87f7af3b3711830362 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Fri, 24 Jul 2026 16:36:50 +0000 Subject: [PATCH 2/2] fix(ci): surface Slack post failures in slack_notify instead of dropping them --- ci3/slack_notify | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ci3/slack_notify b/ci3/slack_notify index 98a249aff5c2..f6e6f7efaa50 100755 --- a/ci3/slack_notify +++ b/ci3/slack_notify @@ -8,7 +8,17 @@ fi channel=${2:-"#aztec3-ci"} data=$(jq -n --arg channel "$channel" --arg text "$1" '{channel: $channel, text: $text}') -curl -X POST https://slack.com/api/chat.postMessage \ +# Post to Slack, capturing the API response. Previously the response went to +# /dev/null, so a failed post (most commonly the bot not being a member of the +# target channel -> "not_in_channel", or an invalid channel/token) vanished with +# no trace and could not be troubleshooted. Surface any failure in the CI log. +# Best-effort: log the failure but do not fail the caller. +response=$(curl -sS -X POST https://slack.com/api/chat.postMessage \ -H "Authorization: Bearer $SLACK_BOT_TOKEN" \ -H "Content-type: application/json" \ - --data "$data" &>/dev/null + --data "$data" 2>&1) + +if [ "$(jq -r '.ok // false' <<<"$response" 2>/dev/null)" != "true" ]; then + error=$(jq -r '.error // empty' <<<"$response" 2>/dev/null) + echo "slack_notify: failed to post to Slack channel '$channel': ${error:-$response}" >&2 +fi