Simplify deployment notification jobs

remerge · Aug 16, 2024 · bd05d3c · bd05d3c
1 parent b21f27c
commit bd05d3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/deployment-start.yml b/.github/workflows/deployment-start.yml
@@ -22,29 +22,25 @@ 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
         with:
           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
@@ -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
@@ -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 }}