From 6f57bc71c5107e800f6fd8ba0714e42822c64775 Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Fri, 3 May 2024 14:13:34 +0100
Subject: [PATCH 1/2] Restore remaining remote builds

---
 .github/workflows/snap.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 77ccf827f8e..229cadba813 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -20,8 +20,7 @@ jobs:
       run: |
         ARCHES=( amd64 )
         if ${{ github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name }}; then
-        #   ARCHES+=( armhf arm64 ) ## remote-build ...armhf is flaky: Don't risk it
-           ARCHES+=( arm64 )
+          ARCHES+=( armhf arm64 )
         fi
         jq --compact-output --null-input '$ARGS.positional' --args -- "${ARCHES[@]}" | awk '{ print "arches=" $0 }' >> $GITHUB_OUTPUT
 

From f4b57b34656915bd9a9502213242aa97dd39cd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sawicz?= <michal@sawicz.net>
Date: Tue, 14 May 2024 09:17:12 +0200
Subject: [PATCH 2/2] snap: drop `build-base: devel`

---
 snap/snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 89587b74e10..599a78be760 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,5 @@
 name: mir-libs
 base: core24
-build-base: devel
 summary: The fast, open and secure display server for any device - build environment
 description: |
   Mir is a display server running on linux systems, with a focus on efficiency,