From bd05d3cf2d1c45c77dd7eb4fa9b27e91590f3e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
Date: Fri, 16 Aug 2024 09:23:07 +0200
Subject: [PATCH] Simplify deployment notification jobs

---
 .github/workflows/deployment-start.yml | 14 +++++---------
 .github/workflows/deployment.yml       |  5 +----
 .github/workflows/static-website.yml   |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deployment-start.yml b/.github/workflows/deployment-start.yml
index 87b86bd..8c06587 100644
--- a/.github/workflows/deployment-start.yml
+++ b/.github/workflows/deployment-start.yml
@@ -22,17 +22,18 @@ on:
     outputs:
       github-deployment-id:
         description: "GitHub deployment ID"
-        value: ${{ jobs.github.outputs.id }}
+        value: ${{ jobs.deployment-start.outputs.github-deployment-id }}
 
       slack-thread-ts:
         description: "Slack thread timestamp"
-        value: ${{ jobs.slack.outputs.ts }}
+        value: ${{ jobs.deployment-start.outputs.slack-thread-ts }}
 
 jobs:
-  slack:
+  deployment-start:
     runs-on: ubuntu-latest
     outputs:
-      ts: ${{ steps.slack.outputs.ts }}
+      slack-thread-ts: ${{ steps.slack.outputs.ts }}
+      github-deployment-id: ${{ steps.github.outputs.deployment_id }}
     steps:
       - id: slack
         uses: hollow/action-slack-deploy-pipeline@CORE-280
@@ -40,11 +41,6 @@ jobs:
           token: ${{ secrets.slack-token }}
           channel: ${{ inputs.slack-channel }}
 
-  github:
-    runs-on: ubuntu-latest
-    outputs:
-      id: ${{ steps.github.outputs.deployment_id }}
-    steps:
       - id: github
         uses: chrnorm/deployment-action@v2
         with:
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index cff758f..efac72a 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -30,7 +30,7 @@ on:
         description: "Slack token for posting messages"
 
 jobs:
-  slack:
+  deployment:
     runs-on: ubuntu-latest
     steps:
       - id: slack
@@ -41,9 +41,6 @@ jobs:
           thread_ts: ${{ inputs.slack-thread-ts }}
           conclusion: true
 
-  github:
-    runs-on: ubuntu-latest
-    steps:
       - id: github
         uses: chrnorm/deployment-status@v2
         with:
diff --git a/.github/workflows/static-website.yml b/.github/workflows/static-website.yml
index f0163df..6142faf 100644
--- a/.github/workflows/static-website.yml
+++ b/.github/workflows/static-website.yml
@@ -138,7 +138,7 @@ jobs:
           parent: false
 
       - uses: hollow/action-slack-deploy-pipeline@CORE-280
-        if: ${{ always() && inputs.slack-channel }}
+        if: ${{ always() && inputs.slack-thread-ts }}
         with:
           token: ${{ secrets.slack-token }}
           channel: ${{ inputs.slack-channel }}