From fd870c6d18ca343bffd7da6f62788b75795a0c11 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Wed, 8 Apr 2026 15:48:59 +0200
Subject: [PATCH 1/2] ci: Move to gha

Github-Pull: #339
Rebased-From: fa2a5efed97afdd0ca11bbc9aca3c130ae0128c2
---
 .cirrus.yml              | 17 -----------------
 .github/workflows/ci.yml | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 17 deletions(-)
 delete mode 100644 .cirrus.yml
 create mode 100644 .github/workflows/ci.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 430627b..0000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-task:
-  use_compute_credits: true
-  compute_engine_instance:  # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms
-    image_project: ubuntu-os-cloud
-    image: family/ubuntu-2404-lts-amd64  # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts
-    cpu: 1
-    memory: 2G
-    disk: 30  # Required for snapcraft pull
-  timeout_in: 20m
-  install_packages_script:
-    - snap install snapcraft --classic
-    - snap install lxd
-    - /snap/bin/lxd init --auto
-  snapcraft_pull_script:
-    - snapcraft pull --use-lxd
-  ci_script:
-    - snapcraft pack --use-lxd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..24b016f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,28 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v6
+      - name: Uninstall Docker, per https://documentation.ubuntu.com/lxd/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker
+        run: |
+          sudo systemctl stop docker.service docker.socket containerd.service
+          sudo apt-get purge -y docker-ce docker-ce-cli containerd.io
+          # Clean up any leftover iptables rules Docker might have left
+          sudo iptables -P FORWARD ACCEPT
+          sudo iptables -F
+      - name: Install Snapcraft and LXD
+        run: |
+          sudo snap install snapcraft --classic
+          sudo snap install lxd
+          sudo /snap/bin/lxd init --auto
+      - name: Pull Snap dependencies
+        run: sudo snapcraft pull --use-lxd
+      - name: Build Snap
+        run: sudo snapcraft pack --use-lxd

From 7e5b48ef0d58f1d5b63cfb31976679178bea88e9 Mon Sep 17 00:00:00 2001
From: Ava Chow <github@achow101.com>
Date: Fri, 10 Jul 2026 13:02:21 -0700
Subject: [PATCH 2/2] snap: Update to 29.4

---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 61a121f..13f1a98 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: bitcoin-core
-version: '29.3'
+version: '29.4'
 summary: Fully validating Bitcoin peer-to-peer network node, wallet and GUI
 description: |
   Bitcoin Core connects to the Bitcoin peer-to-peer network to download and
@@ -83,7 +83,7 @@ parts:
       curl -LO https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/SHA256SUMS
       curl -LO https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz
       curl -LO https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/bitcoin-${SNAPCRAFT_PROJECT_VERSION}-${SNAPCRAFT_ARCH_TRIPLET}.tar.gz
-      echo "70a1679db503b1bd846b92970f087410fac76394ec8a14d2872d9744a66ac6b1  SHA256SUMS" | sha256sum --check
+      echo "3c337c35aca1a0dcbb9438d97240cc6df0a1b9f17ba7eaf404ac63106e9598d7  SHA256SUMS" | sha256sum --check
       sha256sum --ignore-missing --check SHA256SUMS
       tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}-${SNAPCRAFT_ARCH_TRIPLET}.tar.gz
       tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz