From 4b9f57560b3fc10c8efe7ea95aa6c19e0cc7a4e4 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 15 Feb 2023 16:15:47 +0100
Subject: [PATCH] fix(linux): Try a different approach

---
 .github/workflows/deb-packaging.yml   |  2 +-
 resources/build/trigger-builds.inc.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 4d30b202c2..c303bdbcba 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -28,7 +28,7 @@ jobs:
       if: github.event.client_payload.isTestBuild == 'true'
       shell: bash
       run: |
-        GIT_SHA=$(git rev-parse "${{ github.event.client_payload.prhead }}")
+        GIT_SHA="${{ github.event.client_payload.sha }}")
         echo "GIT_SHA=$GIT_SHA" >> $GITHUB_OUTPUT
         gh api \
           --method POST \
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 3bf87416ab..ac8d519d4a 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -129,30 +129,30 @@ function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
   local GITHUB_ACTION="$2"
   local GIT_BRANCH="${3:-master}"
-  local GIT_REF GIT_PRHEAD
+  local GIT_REF GIT_SHA
 
   local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman/dispatches
 
   if [ "${action:-""}" == "commit" ]; then
     # This will only be true if we created and pushed a tag
     GIT_REF="refs/tags/release@$VERSION_WITH_TAG"
-    GIT_PRHEAD="${GIT_REF}"
+    GIT_SHA="$(git rev-parse "${GIT_REF}")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
     GIT_REF="refs/pull/${GIT_BRANCH}/merge"
-    GIT_PRHEAD="refs/pull/${GIT_BRANCH}/head"
+    GIT_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
     GIT_REF="refs/heads/${GIT_BRANCH}"
-    GIT_PRHEAD="${GIT_REF}"
+    GIT_SHA="$(git rev-parse "${GIT_REF}")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
   fi
 
   local DATA="{\"event_type\": \"$GIT_EVENT_TYPE\", \
       \"client_payload\": { \
         \"ref\": \"$GIT_REF\", \
-        \"prhead\": \"$GIT_PRHEAD\", \
+        \"sha\": \"$GIT_SHA\", \
         \"branch\": \"$GIT_BRANCH\", \
         \"isTestBuild\": \"$IS_TEST_BUILD\" \
     }}"