Merge pull request #11680 from keymanapp/fix/linux/apiverification

fix(linux): add more debug output
keymanapp · Jun 4, 2024 · 5beee3a · 5beee3a
2 parents b7de602 + 7abbaac
commit 5beee3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/api-verification.yml b/.github/workflows/api-verification.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   api_verification:
-    name: Verify API for libkeymancore.so
+    name: Verify API for libkeymancore*.so
     runs-on: ubuntu-latest
     outputs:
       VERSION: ${{ steps.environment_step.outputs.VERSION }}
@@ -66,19 +66,24 @@ jobs:
       with:
         packages: devscripts equivs
 
-    - name: "Verify API for libkeymancore.so (${{ steps.environment_step.outputs.GIT_BRANCH }}, branch ${{ steps.environment_step.outputs.GIT_BASE_BRANCH }}, by ${{ steps.environment_step.outputs.GIT_USER }})"
+    - name: "Verify API for libkeymancore*.so (${{ steps.environment_step.outputs.GIT_BRANCH }}, branch ${{ steps.environment_step.outputs.GIT_BASE_BRANCH }}, by ${{ steps.environment_step.outputs.GIT_USER }})"
       run: |
         echo "VERSION=${{ steps.environment_step.outputs.VERSION }}"
         echo "PRERELEASE_TAG=${{ steps.environment_step.outputs.PRERELEASE_TAG }}"
         echo "GIT_SHA=${{ steps.environment_step.outputs.GIT_SHA }}"
         echo "GIT_BASE=${{ steps.environment_step.outputs.GIT_BASE  }}"
+        ls -al ${GITHUB_WORKSPACE}
+        ls -al ${GITHUB_WORKSPACE}/artifacts
+        BIN_PACKAGE=$(ls "${GITHUB_WORKSPACE}/artifacts/${PKG_NAME}[0-9]*_${{ steps.environment_step.outputs.VERSION }}-1${{ steps.environment_step.outputs.PRERELEASE_TAG }}+$(lsb_release -c -s)1_amd64.deb")
+        echo "BIN_PACKAGE=${BIN_PACKAGE}"
+        ls -al ${BIN_PACKAGE}
         cd ${{ github.workspace }}/keyman/linux
         ./scripts/deb-packaging.sh \
           --gha \
-          --bin-pkg "${GITHUB_WORKSPACE}/artifacts/${PKG_NAME}[0-9]*_${{ steps.environment_step.outputs.VERSION }}-1${{ steps.environment_step.outputs.PRERELEASE_TAG }}+$(lsb_release -c -s)1_amd64.deb" \
+          --bin-pkg "${BIN_PACKAGE}" \
           --git-sha "${{ steps.environment_step.outputs.GIT_SHA }}" \
           --git-base "${{ steps.environment_step.outputs.GIT_BASE }}" \
-          verify 2>> $GITHUB_STEP_SUMMARY
+          verify # 2>> $GITHUB_STEP_SUMMARY
 
     - name: Archive .symbols file
       uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0

diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2154 # (variables are set in build-utils.sh)
-# Actions for creating a Debian source package. Used by deb-packaging.yml GHA.
+# Actions for creating a Debian source package and verifying the API.
+# Used by deb-packaging.yml and api-verification.yml GHAs.
 
 set -eu
 shopt -s inherit_errexit