Merge branch 'main' into feature/test-message

# Conflicts: # .github/workflows/test-slack.yml
ho-nl · Jul 15, 2024 · 1e1292b · 1e1292b
2 parents c4e8c28 + 31fb3a5
commit 1e1292b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/notify-slack-end.yml b/.github/workflows/notify-slack-end.yml
@@ -2,6 +2,9 @@ name: Release
 on:
   workflow_call:
     inputs:
+      message:
+        required: false
+        type: string
       channel:
         required: true
         type: string
@@ -47,7 +50,7 @@ jobs:
                         "type": "section",
                         "text": {
                           "type": "mrkdwn",
-                          "text": "*${{ github.event.repository.name }} - Action - ${{ github.workflow }}* \n <${{ github.event.repository.url }}/commit/${{ github.sha }} | ${{ env.cut_sha }}> (<${{ github.event.repository.url }}/actions/runs/${{ github.run_id }} | open>)"
+                          "text": "*${{ inputs.message && inputs.message || github.event.repository.name }} - ${{ github.workflow }}* \n <${{ github.event.repository.url }}/commit/${{ github.sha }} | ${{ env.cut_sha }}> (<${{ github.event.repository.url }}/actions/runs/${{ github.run_id }} | open>)"
                         }
                       },
                       {

diff --git a/.github/workflows/notify-slack-start.yml b/.github/workflows/notify-slack-start.yml
@@ -2,6 +2,9 @@ name: Release
 on:
   workflow_call:
     inputs:
+      message:
+        required: false
+        type: string
       channel:
         required: true
         type: string
@@ -45,7 +48,7 @@ jobs:
                       "type": "section",
                       "text": {
                         "type": "mrkdwn",
-                        "text": "*${{ github.event.repository.name }} - Action - ${{ github.workflow }}* 🚀 \n <${{ github.event.repository.url }}/commit/${{ github.sha }} | ${{ env.cut_sha }}> (<${{ github.event.repository.url }}/actions/runs/${{ github.run_id }} | open>)"
+                        "text": "*${{ inputs.message && inputs.message || github.event.repository.name }} - ${{ github.workflow }}* 🚀 \n <${{ github.event.repository.url }}/commit/${{ github.sha }} | ${{ env.cut_sha }}> (<${{ github.event.repository.url }}/actions/runs/${{ github.run_id }} | open>)"
                       }
                       },
                       {

diff --git a/.github/workflows/test-slack.yml b/.github/workflows/test-slack.yml
@@ -29,13 +29,13 @@ jobs:
   notify-end:
     if: always()
     name: Notify release end
-    needs: [ notify-start, release ]
+    needs: [ notify-start, activate-pm2 ]
     uses: ho-nl/release-slack-action/.github/workflows/notify-slack-end.yml@main
     secrets:
       slackToken: ${{ secrets.SLACK_BOT_RELEASE_TOKEN}}
     with:
       time: ${{ needs.notify-start.outputs.time }}
-      result: ${{ needs.release.result }}
+      result: ${{ needs.activate-pm2.result }}
       channel: 12gobiking-test
       message: Test
       notifyOnlyOnFailure: false
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ jobs:
     secrets:
       slackToken: ${{ secrets.SLACK_BOT_RELEASE_TOKEN}}
     with:
+      message: CUSTOM_MESSAGE (optional if no message is provided, the repository name will be used)
       channel: YOUR_CHANNEL_TO_POST_MESSAGES
       notifyOnlyOnFailure: boolean
 
@@ -39,6 +40,7 @@ jobs:
     with:
       time: ${{ needs.notify-start.outputs.time }}
       result: ${{ needs.release.result }}
+      message: CUSTOM_MESSAGE (optional if no message is provided, the repository name will be used)
       channel: YOUR_CHANNEL_TO_POST_MESSAGES
       notifyOnlyOnFailure: boolean
 ```