From b2bcbd2bcae84a3a09a3fd94878c4145d8c5dbf4 Mon Sep 17 00:00:00 2001
From: Aaron Guise <aaron@guise.net.nz>
Date: Tue, 14 May 2024 17:08:15 +1200
Subject: [PATCH] ci: Updated cron scheduler

---
 .github/workflows/ci.yml   | 57 +++++++++++++++++++++-----------------
 .github/workflows/cron.yml | 12 +++++---
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48d0de7..50bc007 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
       - "**"
     tags:
       - "!**"
-      
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -81,27 +81,34 @@ jobs:
        env:
          GITEA_TOKEN: ${{ secrets.G_TOKEN }}
          GITEA_HOST: ${{ secrets.G_SERVER_URL}}
-     - name: ntfy-success-notifications
-       uses: niniyas/ntfy-action@master
-       if: success()
-       with:
-         url: '${{ vars.NTFY_URL }}'
-         title: Workflow success
-         topic: 'ci-status'
-         priority: 4
-         tags: +1,partying_face,action,successfully,completed
-         details: Workflow has been successfully completed!
-         icon: 'https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png'
-         image: true
-  
-     - name: ntfy-failed-notifications
-       uses: niniyas/ntfy-action@master
-       if: failure()
-       with:
-         url: '${{ vars.NTFY_URL }}'
-         title: Workflow failed
-         topic: 'ci-status'
-         priority: 5
-         tags: -1,skull,action,failed
-         details: Workflow has failed!
-         actions: 'default'
\ No newline at end of file
+  notify:
+    runs-on: ubuntu-latest
+    needs:
+      - lint
+      - molecule
+      - release
+    steps:
+      - name: ntfy-success-notifications
+        uses: niniyas/ntfy-action@master
+        if: success()
+        with:
+          url: '${{ vars.NTFY_URL }}'
+          title: Workflow success - ansible-role-common
+          topic: 'ci-status'
+          priority: 4
+          tags: +1,partying_face,action,successfully,completed
+          details: Workflow has been successfully completed!
+          icon: 'https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png'
+          image: true
+ 
+      - name: ntfy-failed-notifications
+        uses: niniyas/ntfy-action@master
+        if: failure()
+        with:
+          url: '${{ vars.NTFY_URL }}'
+          title: Workflow failed - ansible-role-common
+          topic: 'ci-status'
+          priority: 5
+          tags: -1,skull,action,failed
+          details: Workflow has failed!
+          actions: 'default'
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 4ef1e11..da9f916 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -30,27 +30,31 @@ jobs:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           MOLECULE_DISTRO: ${{ matrix.os }}
+  notify:
+    runs-on: ubuntu-latest
+    needs: molecule
+    steps:
       - name: ntfy-success-notifications
         uses: niniyas/ntfy-action@master
         if: success()
         with:
           url: '${{ vars.NTFY_URL }}'
-          title: Workflow success
+          title: Workflow success - ansible-role-common
           topic: 'ci-status'
           priority: 4
           tags: +1,partying_face,action,successfully,completed
           details: Workflow has been successfully completed!
           icon: 'https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png'
           image: true
-  
+
       - name: ntfy-failed-notifications
         uses: niniyas/ntfy-action@master
         if: failure()
         with:
           url: '${{ vars.NTFY_URL }}'
-          title: Workflow failed
+          title: Workflow failed - ansible-role-common
           topic: 'ci-status'
           priority: 5
           tags: -1,skull,action,failed
           details: Workflow has failed!
-          actions: 'default'
\ No newline at end of file
+          actions: 'default'