Merge branch 'master' into buildingdirec

.github/workflows/ubuntu.yml

@@ -122,7 +122,13 @@ jobs:
       id-token: write
       contents: write
       attestations: write
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: ubuntu-24.04-arm
     outputs:
       snap-file: ${{ steps.build-snap.outputs.snap }}
     steps:

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: gpsbabel # you probably want to 'snapcraft register <name>'
-base: core22 # the base snap is the execution environment for this snap
+base: core24 # the base snap is the execution environment for this snap
 version: '0.1' # just for humans, typically '1.2+git' or '1.3.2'
 summary: "Convert, manipulate and transfer GPS data"
 description: |
@@ -66,10 +66,10 @@ parts:
       - pkg-config
       - libudev-dev
       - qt6-base-dev
-      - libqt6core5compat6-dev
+      - qt6-5compat-dev
     stage-packages:
       - zlib1g
-      - libshp2
+      - libshp4
       - libusb-1.0-0
       - libqt6core6
       - libqt6core5compat6

tools/uploadtool/upload_github.sh

@@ -79,7 +79,7 @@ echo "release_url: $release_url"
 target_commit_sha=$(echo "$release_infos" | grep '"target_commitish":' | head -n 1 | cut -d '"' -f 4 | cut -d '{' -f 1)
 echo "target_commit_sha: $target_commit_sha"
 
-if [ "{$GITHUB_SHA}" != "$target_commit_sha" ] ; then
+if [ "${GITHUB_SHA}" != "$target_commit_sha" ] ; then
 
   echo "GITHUB_SHA != target_commit_sha, hence deleting $RELEASE_NAME..."