chore: Use buildin var for Branch name

ContinuousSecurityTooling · Sep 30, 2023 · 27bd8ec · 27bd8ec
1 parent 195cf63
commit 27bd8ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -110,17 +110,12 @@ jobs:
       - name: Wait for Keycloak server
         run: .bin/wait-for-server.sh
 
-      - name: Extract branch name
-        id: extract_branch
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-
       - name: Run end2end tests
         run: npm run end2end:test
         env:
           WEBHOOK_TESTING_TEAMS: ${{ secrets.WEBHOOK_TESTING_TEAMS }}
           WEBHOOK_TESTING_SLACK: ${{ secrets.WEBHOOK_TESTING_SLACK }}
-          WEBHOOK_ADDITIONAL_MESSAGE: ${{ steps.extract_branch.outputs.branch }}
+          WEBHOOK_ADDITIONAL_MESSAGE: ${{ github.ref }}
 
   package:
     name: Build Container Image

diff --git a/e2e/spec/webhooks.js b/e2e/spec/webhooks.js
@@ -49,8 +49,9 @@ test(
         '--output=webhook',
         '--webhookType=teams',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_TEAMS,
-        ('--webhookMessage="' + process.env.WEBHOOK_ADDITIONAL_MESSAGE) |
-          ('From Github Actions' + '"')
+        '--webhookMessage="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE |
+            ('From Github Actions' + '"'))
       ],
       {
         env: {
@@ -85,8 +86,9 @@ test(
         '--output=webhook',
         '--webhookType=slack',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_SLACK,
-        ('--webhookMessage="' + process.env.WEBHOOK_ADDITIONAL_MESSAGE) |
-          ('From Github Actions' + '"')
+        '--webhookMessage="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE |
+            ('From Github Actions' + '"'))
       ],
       {
         env: {