From ce6fae900febada1faf6285f80ca10ab60d175fa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 17 Feb 2021 10:41:55 +0100
Subject: [PATCH] CI: massage message a bit and adjust naming scheme

---
 .github/workflows/nightly-debian.yml        | 4 ++--
 .github/workflows/nightly-neon.yml          | 4 ++--
 .github/workflows/nightly-opensuse.yml      | 4 ++--
 .github/workflows/{ci-neon.yml => push.yml} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename .github/workflows/{ci-neon.yml => push.yml} (88%)

diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml
index 4c3dc67ca..3fd558e21 100644
--- a/.github/workflows/nightly-debian.yml
+++ b/.github/workflows/nightly-debian.yml
@@ -89,7 +89,7 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
       - name: "notify: fail"
         uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
@@ -97,4 +97,4 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml
index c20887fc3..92f71c10b 100644
--- a/.github/workflows/nightly-neon.yml
+++ b/.github/workflows/nightly-neon.yml
@@ -88,7 +88,7 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
       - name: "notify: fail"
         uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
@@ -96,4 +96,4 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
index 0ededfaf0..c3762fb99 100644
--- a/.github/workflows/nightly-opensuse.yml
+++ b/.github/workflows/nightly-opensuse.yml
@@ -87,7 +87,7 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} OK ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
       - name: "notify: fail"
         uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
@@ -95,4 +95,4 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "SCHEDULED ${{ github.workflow }} FAIL ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
diff --git a/.github/workflows/ci-neon.yml b/.github/workflows/push.yml
similarity index 88%
rename from .github/workflows/ci-neon.yml
rename to .github/workflows/push.yml
index 80b10ab53..0889ea278 100644
--- a/.github/workflows/ci-neon.yml
+++ b/.github/workflows/push.yml
@@ -84,7 +84,7 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "PUSH ${{ github.workflow }} OK ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}"
       - name: "notify: fail"
         uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
@@ -92,4 +92,4 @@ jobs:
           server: chat.freenode.net
           nickname: cala-ci
           channel: "#calamares"
-          message: "PUSH ${{ github.workflow }} FAIL ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}"