PSRDDP-201: Update COMMIT_MESSAGE var

govuk-one-login · May 16, 2024 · f906dab · f906dab
1 parent 2281463
commit f906dab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/action.yaml b/action.yaml
@@ -25,6 +25,5 @@ runs:
         ARTIFACT_BUCKET: ${{ inputs.artifact-bucket-name }}
         SIGNING_PROFILE: ${{ inputs.signing-profile-name }}
         TEMPLATE_FILE: ${{ inputs.template-file }}
-        COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       run: ${{ github.action_path }}/scripts/upload.sh
       shell: bash
diff --git a/scripts/upload.sh b/scripts/upload.sh
@@ -2,6 +2,9 @@
 
 set -eu
 
+# This gets the commit message of whatever branch is in use
+COMMIT_MESSAGE=$(git show -s --format=%s)
+
 echo "Parsing resources to be signed"
 RESOURCES="$(yq '.Resources.* | select(has("Type") and .Type == "AWS::Serverless::Function" or .Type == "AWS::Serverless::LayerVersion") | path | .[1]' "$TEMPLATE_FILE" | xargs)"
 read -ra LIST <<< "$RESOURCES"