From f0531183ae47c89e781b5e0782928dc191996763 Mon Sep 17 00:00:00 2001
From: Sebastian Zumbrunn <sebastian.zumbrunn@sonarsource.com>
Date: Tue, 16 Jun 2026 09:08:35 +0200
Subject: [PATCH 1/2] Update Codeowner after code quality re-org

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 090c5ff6..5272a9c6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-.github/CODEOWNERS @SonarSource/quality-data-ml-squad
+.github/CODEOWNERS @SonarSource/code-quality-ci-experience-squad

From 80d201ea9a43727b08daa7464de4444f079a6a9f Mon Sep 17 00:00:00 2001
From: Sebastian Zumbrunn <sebastian.zumbrunn@sonarsource.com>
Date: Tue, 16 Jun 2026 10:24:06 +0200
Subject: [PATCH 2/2] Migrate GHA over to new chanel and fix SlackNotify

---
 .github/workflows/MacOsNightly.yml | 37 ------------------------
 .github/workflows/SlackNotify.yml  | 45 ++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/MacOsNightly.yml b/.github/workflows/MacOsNightly.yml
index d02034d1..09337d41 100644
--- a/.github/workflows/MacOsNightly.yml
+++ b/.github/workflows/MacOsNightly.yml
@@ -81,40 +81,3 @@ jobs:
 
       - name: Execute the integration tests
         run: ./.github/scripts/run_its.sh
-
-  notify-on-failure:
-    name: "Notify on Failure"
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    needs: [qa-macos, its-macos]
-    if: failure() && github.event_name == 'schedule'
-    steps:
-      - name: Write failure summary
-        run: |
-          echo "## macOS Nightly Build Failed" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "The scheduled macOS nightly build has failed." >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Workflow Run:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-
-      - name: Vault Secrets
-        id: secrets
-        uses: SonarSource/vault-action-wrapper@v3
-        with:
-          secrets: |
-            development/kv/data/slack token | SLACK_TOKEN;
-
-      - name: Send Slack notification
-        uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
-        env:
-          SLACK_TOKEN: ${{ fromJSON(steps.secrets.outputs.vault).SLACK_TOKEN }}
-          SLACK_CHANNEL: squad-python-notifs
-          SLACK_COLOR: danger
-          SLACK_TITLE: Build Failed
-          SLACK_MESSAGE: |
-            Workflow failed in ${{ github.repository }} 🚨
-            ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          SLACK_USERNAME: BuildBot
-
diff --git a/.github/workflows/SlackNotify.yml b/.github/workflows/SlackNotify.yml
index 6d5f7471..a8433329 100644
--- a/.github/workflows/SlackNotify.yml
+++ b/.github/workflows/SlackNotify.yml
@@ -1,22 +1,49 @@
 ---
 name: Slack Notifications
 on:
-  check_suite:
-    types: [completed]
+  workflow_run:
+    workflows:
+      - Build
+      - Iris sync
+      - Releasability status
+      - macOS Nightly Build
+      - sonar-release
+    types:
+      - completed
 
 permissions:
   contents: read
   id-token: write
-  checks: read
+
 jobs:
   notify:
-    if: >-
-      contains(fromJSON('["main", "master"]'), github.event.check_suite.head_branch) || startsWith(github.event.check_suite.head_branch, 'dogfood-') || startsWith(github.event.check_suite.head_branch, 'branch-')
+    if: >
+      github.event.workflow_run.conclusion == 'failure' &&
+      (
+        github.event.workflow_run.name == 'sonar-release' ||
+        github.event.workflow_run.head_branch == 'master' ||
+        startsWith(github.event.workflow_run.head_branch, 'branch-') ||
+        startsWith(github.event.workflow_run.head_branch, 'dogfood-')
+      )
     runs-on: ubuntu-latest
     steps:
+      - name: Vault Secrets
+        id: secrets
+        uses: SonarSource/vault-action-wrapper@v3
+        with:
+          secrets: |
+            development/kv/data/slack token | SLACK_TOKEN;
+
       - name: Send Slack Notification
+        uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
         env:
-          GITHUB_TOKEN: ${{ github.token }}
-        uses: SonarSource/gh-action_slack-notify@9532fdcfa4143ed5da2da7b0e77172abbe24ae33 # 1.0.2
-        with:
-          slackChannel: squad-python-notifs
+          SLACK_TOKEN: ${{ fromJSON(steps.secrets.outputs.vault).SLACK_TOKEN }}
+          SLACK_CHANNEL: ops-ci-experience
+          SLACK_COLOR: danger
+          SLACK_TITLE: Workflow Failed
+          SLACK_MESSAGE: |
+            Workflow failed in ${{ github.repository }} 🚨
+            Workflow: ${{ github.event.workflow_run.name }}
+            Branch: ${{ github.event.workflow_run.head_branch }}
+            ${{ github.event.workflow_run.html_url }}
+          SLACK_USERNAME: BuildBot