Skip to content

Commit

Permalink
snap: update for core24 (#975)
Browse files Browse the repository at this point in the history

Co-authored-by: Evan Paterakis <evan@geopjr.dev>
  • Loading branch information
soumyaDghosh and GeopJr authored Jun 18, 2024
1 parent 1e6df2d commit 79d7dfd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ trim_trailing_whitespace = true
charset = utf-8
indent_size = 4

[*.{build,build.in}]
[*.{build,build.in,yml,yaml}]
indent_style = space
indent_size = 2
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: "Vala Lint"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: elementary/actions/vala-lint@master
with:
conf: vala-lint.conf
Expand All @@ -28,7 +28,7 @@ jobs:
# Don't fail the whole workflow if one architecture fails
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Docker is required by the docker/setup-qemu-action which enables emulation
- name: Install deps
if: matrix.arch == 'aarch64'
Expand All @@ -51,23 +51,22 @@ jobs:
snap-builder:
name: "Snap Builder"
runs-on: ubuntu-latest
if: ${{ false }} # disable until snap updates the sdk to GNOME 46
# if: ${{ false }} # disable until snap updates the sdk to GNOME 46
needs: [ lint ]
strategy:
matrix:
arch: [x86_64, aarch64]
arch:
- x86_64
# - aarch64 # needs some changes in the action to incorporate core24
# Don't fail the whole workflow if one architecture fails
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v2
if: matrix.arch == 'aarch64'
- uses: mikefarah/yq@v4.33.3
if: matrix.arch == 'aarch64'
- run: |
mv ./build-aux/snap/snapcraft.yaml .
sed -i '/version: git/d' snapcraft.yaml
yq -i 'del(.parts.cleanup)' snapcraft.yaml
if: matrix.arch == 'aarch64'
- uses: diddlesnaps/snapcraft-multiarch-action@v1
if: matrix.arch == 'aarch64'
Expand All @@ -77,7 +76,9 @@ jobs:
- uses: snapcore/action-build@v1
id: snapcraft
if: matrix.arch == 'x86_64'
- uses: actions/upload-artifact@v3
env:
SNAPCRAFT_ENABLE_EXPERIMENTAL_EXTENSIONS: 1
- uses: actions/upload-artifact@v4
with:
name: snap-${{ matrix.arch }}
path: ${{ steps.snapcraft_docker.outputs.snap }}${{ steps.snapcraft.outputs.snap }}
16 changes: 2 additions & 14 deletions build-aux/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: tuba
base: core22
base: core24
version: git
adopt-info: tuba

Expand Down Expand Up @@ -36,16 +36,4 @@ parts:
build-packages:
- libjson-glib-dev
- libsecret-1-dev
cleanup:
after: # Make this part run last; list all your other parts here
- tuba
plugin: nil
build-snaps: # List all content-snaps and base snaps you're using here
- core22
- gnome-46-2404
- gnome-46-2404-sdk
override-prime: |
set -eux
for snap in "core22" "gnome-46-2404" "gnome-46-2404-sdk"; do # List all content-snaps and base snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
done

0 comments on commit 79d7dfd

Please sign in to comment.