fix(ci,release): update slack commit message

Kong · Jan 9, 2025 · 4ee217a · 4ee217a
1 parent 705e585
commit 4ee217a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,20 +80,24 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}|${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}>"
+                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }}|${{ github.ref_name }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Workflow Run:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_number }}>"
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}>"
+                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ steps.slack-variables.outputs.short-commit-hash }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Triggered By:*\n${{ github.actor }}"
                     },
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Commit Author:*\n${{ github.event.head_commit.author.name }}"
+                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Event Name:*\n${{ github.event_name }}"
@@ -131,20 +135,24 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}|${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}>"
+                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }}|${{ github.ref_name }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Workflow Run:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_number }}>"
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}>"
+                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ steps.slack-variables.outputs.short-commit-hash }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Triggered By:*\n${{ github.actor }}"
                     },
+                    {
+                      "type": "mrkdwn",
+                      "text": "*Commit Author:*\n${{ github.event.head_commit.author.name }}"
+                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Event Name:*\n${{ github.event_name }}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,6 @@ jobs:
       - name: Setup Git Config
         shell: bash
         run: |
-          git checkout ${{ github.head_ref }}
           git config --local user.name "kong-security-bot"
           git config --local user.email "[email protected]"
 
@@ -99,15 +98,15 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}|${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}>"
+                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }}|${{ github.ref_name }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Workflow Run:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_number }}>"
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}>"
+                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>"
                     },
                     {
                       "type": "mrkdwn",
@@ -117,10 +116,6 @@ jobs:
                       "type": "mrkdwn",
                       "text": "*Triggered By:*\n${{ github.actor }}"
                     },
-                    {
-                      "type": "mrkdwn",
-                      "text": "*Commit Author:*\n${{ github.event.head_commit.author.name }}"
-                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Event Name:*\n${{ github.event_name }}"
@@ -158,15 +153,15 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}|${{ github.head_ref || steps.slack-variables.outputs.fallback-branch-name }}>"
+                      "text": "*Branch:*\n<${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }}|${{ github.ref_name }}>"
                     },
                     {
                       "type": "mrkdwn",
                       "text": "*Workflow Run:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.run_number }}>"
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}>"
+                      "text": "*TriggeredByCommit:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>"
                     },
                     {
                       "type": "mrkdwn",
@@ -176,10 +171,6 @@ jobs:
                       "type": "mrkdwn",
                       "text": "*Triggered By:*\n${{ github.actor }}"
                     },
-                    {
-                      "type": "mrkdwn",
-                      "text": "*Commit Author:*\n${{ github.event.head_commit.author.name }}"
-                    },
                     {
                       "type": "mrkdwn",
                       "text": "*Event Name:*\n${{ github.event_name }}"