fix: [FX-4058] use proper sha for different event types (#194)

toptal · Jul 27, 2023 · 4662ded · 4662ded
1 parent bcfdee7
commit 4662ded
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/polite-colts-hammer.md b/.changeset/polite-colts-hammer.md
@@ -0,0 +1,5 @@
+---
+'davinci-github-actions': patch
+---
+
+- fix sha for jira deployment gh action
diff --git a/create-jira-deployment/action.yml b/create-jira-deployment/action.yml
@@ -67,8 +67,8 @@ runs:
       run: |
         echo APP_NAME=$(echo "${{ github.repository }}" | cut -d'/' -f2) >> $GITHUB_OUTPUT
 
-    - id: branch
-      uses: xt0rted/[email protected]
+    - id: sha
+      uses: toptal/davinci-github-actions/get-workflow-sha@master
 
     - name: Trigger `Create JIRA` deployment
       uses: toptal/[email protected]
@@ -83,6 +83,6 @@ runs:
           {
             "appName": "${{ steps.repo.outputs.APP_NAME }}",
             "envName": "${{ inputs.environment }}",
-            "sha": "${{ steps.branch.outputs.head_sha }}"
+            "sha": "${{ github.event.pull_request.head.sha || steps.sha.outputs.result }}"
           }
         job_timeout: '3600'