From 0f98949e4739f5c81c0a66f5c8ed51952cfca361 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:04:55 -0700 Subject: [PATCH] update snap build (#1404) * update snap to core24 * add arm64 snap --- .github/workflows/ubuntu.yml | 8 +++++++- snap/snapcraft.yaml | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4b03fa7f1..04d0f004e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.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: diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index cd88c786c..b14200a60 100755 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: gpsbabel # you probably want to 'snapcraft register ' -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