Improve CI notification text

ebu · Dec 21, 2021 · cd63bdd · cd63bdd
1 parent 64d3d3e
commit cd63bdd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/docs_and_ui.yml b/.github/workflows/docs_and_ui.yml
@@ -83,13 +83,14 @@ jobs:
         uses: edge/simple-slack-notify@v1.1.2
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          BRANCH: ${{ github.ref }}
+          BRANCH: ${{ github.ref_name }}
           ACTOR: ${{ github.actor }}
+          COMMIT_REF: ${{ github.sha }}
         with:
           channel: '#ci'
           status: ${{ job.status }}
-          success_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} completed successfully'
-          failure_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} failed'
-          cancelled_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} was cancelled'
+          success_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} completed successfully'
+          failure_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} failed'
+          cancelled_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} was cancelled'
           fields: |
-            [{ "title": "Workflow log URL", "value": "${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}"}]
+            [{ "title": "${env.GITHUB_WORKFLOW} log URL"}]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,13 +49,14 @@ jobs:
         uses: edge/simple-slack-notify@v1.1.2
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          BRANCH: ${{ github.ref }}
+          BRANCH: ${{ github.ref_name }}
           ACTOR: ${{ github.actor }}
+          COMMIT_REF: ${{ github.sha }}
         with:
           channel: '#ci'
           status: ${{ job.status }}
-          success_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} completed successfully'
-          failure_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} failed'
-          cancelled_text: 'Build (#${env.GITHUB_RUN_NUMBER}) workflow ${env.GITHUB_WORKFLOW} of ${env.BRANCH} by ${env.ACTOR} was cancelled'
+          success_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} completed successfully'
+          failure_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} failed'
+          cancelled_text: 'Build <${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}|#${env.GITHUB_RUN_NUMBER}> (${env.COMMIT_REF}) of ${env.BRANCH} by ${env.ACTOR} was cancelled'
           fields: |
-            [{ "title": "Workflow log URL", "value": "${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}"}]
+            [{ "title": "${env.GITHUB_WORKFLOW}"}]