From b45a76f432dc2104c7399570d3babd1cd82a46b5 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 9 Feb 2023 11:16:59 +0100
Subject: [PATCH 1/2] fix(linux): Fix Verify-API step of GHA

---
 .github/workflows/deb-packaging.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 79c895dbd4..d05570a7c9 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -203,8 +203,8 @@ jobs:
     - name: Verify API
       run: |
         cd linux
-        SRC_PKG="artifacts/keyman-srcpkg/keyman_${{ needs.sourcepackage.outputs.VERSION }}-1.debian.tar.xz" \
-        BIN_PKG="artifacts/keyman-binarypkgs/libkmnkbp0-0_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
+        SRC_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-srcpkg/keyman_${{ needs.sourcepackage.outputs.VERSION }}-1.debian.tar.xz" \
+        BIN_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/libkmnkbp0-0_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
         PKG_VERSION="${{ needs.sourcepackage.outputs.VERSION }}" \
         ./scripts/deb-packaging.sh --gha verify >> $GITHUB_STEP_SUMMARY
 

From 53e10ad0a6d442966226a963184347378dfad5cb Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 9 Feb 2023 16:15:42 +0100
Subject: [PATCH 2/2] fix(linux): Fix checkout of PRs

We need to specify the full ref, otherwise GitHub will add
`refs/heads` and `refs/tags` which won't work for pull requests.
---
 resources/build/trigger-builds.inc.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 217e19db9f..f0fca1f94a 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -129,17 +129,18 @@ function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
   local GITHUB_ACTION="$2"
   local GIT_BRANCH="${3:-master}"
-  local GIT_REF=$GIT_BRANCH
+  local GIT_REF
 
   local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman/dispatches
 
-  # This will only be true if we created and pushed a tag
   if [ "${action:-""}" == "commit" ]; then
-    GIT_REF="release@$VERSION_WITH_TAG"
-  fi
-
-  if [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
+    # This will only be true if we created and pushed a tag
+    GIT_REF="refs/tags/release@$VERSION_WITH_TAG"
+  elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
+    GIT_REF="refs/pull/${GIT_BRANCH}/merge"
     GIT_BRANCH="PR-${GIT_BRANCH}"
+  else
+    GIT_REF="refs/heads/${GIT_BRANCH}"
   fi
 
   local DATA="{\"event_type\": \"$GITHUB_ACTION\", \