Skip to content

Commit db2da26

Browse files
committed
Merge #271: snap: core20 (with ci)
ebc7d2e snap: core20 (with ci) (maflcko) Pull request description: The `core18` builder is insufficient, now that glibc in the release builds was bumped (bitcoin/bitcoin#29987). Fix it by bumping to `core20`, because `core18` is also deprecated and only available in the snapcraft `7.x` track according to https://snapcraft.io/docs/base-snaps#core18. The change comes with required fixups in the `snapcraft.yaml`. This change also comes with a required switch to lxd in the CI. This is, because "For core20, Multipass is the default provider on all platforms.", according to https://canonical-snapcraft.readthedocs-hosted.com/en/latest/howto/select-a-build-provider/#core20-override-methods. However, multipass by default uses a QEMU KVM driver, according to https://canonical.com/multipass/docs/driver#p-74200-default-drivers. So just use lxd in the CI, as KVM isn't available. ACKs for top commit: achow101: ACK ebc7d2e hebasto: re-ACK ebc7d2e. Tree-SHA512: 69b419fc397a37a3fbc54f4b999b9cb794fd8ff9d9b712e3ce87d11c3401e7723ab45a1198223bde4b284de09cb86ef5887fcdefbadbfb5af0e631bb1e963d85
2 parents 1028195 + ebc7d2e commit db2da26

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.cirrus.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
task:
22
use_compute_credits: true
3-
container:
4-
image: ubuntu:18.04
3+
compute_engine_instance: # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms
4+
image_project: ubuntu-os-cloud
5+
image: family/ubuntu-2404-lts-amd64 # https://cloud.google.com/compute/docs/images/os-details#ubuntu_lts
56
cpu: 1
67
memory: 2G
78
timeout_in: 20m
8-
env:
9-
DOCKER_PACKAGES: "snapcraft"
109
install_packages_script:
11-
- apt-get update
12-
- apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES
10+
- snap install snapcraft --classic
11+
- snap install lxd
12+
- /snap/bin/lxd init --auto
1313
snapcraft_pull_script:
14-
- snapcraft pull
14+
- snapcraft pull --use-lxd
1515
ci_script:
16-
- snapcraft
16+
- snapcraft --use-lxd

snap/snapcraft.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ description: |
88
99
grade: stable
1010
confinement: strict
11-
base: core18
11+
base: core20
1212

1313
apps:
1414
daemon:
15-
command: bitcoind
15+
command: bin/bitcoind
1616
plugs: [home, removable-media, network, network-bind]
1717
environment:
1818
# Override HOME so the datadir is located at
@@ -22,27 +22,27 @@ apps:
2222
# https://docs.snapcraft.io/environment-variables/7983
2323
HOME: $SNAP_USER_COMMON
2424
qt:
25-
command: desktop-launch bitcoin-qt
25+
command: bin/desktop-launch bin/bitcoin-qt
2626
plugs: [home, removable-media, network, network-bind, desktop, x11, unity7]
2727
environment:
2828
HOME: $SNAP_USER_COMMON
2929
DISABLE_WAYLAND: 1
3030
cli:
31-
command: bitcoin-cli
31+
command: bin/bitcoin-cli
3232
plugs: [home, removable-media, network]
3333
environment:
3434
HOME: $SNAP_USER_COMMON
3535
tx:
36-
command: bitcoin-tx
36+
command: bin/bitcoin-tx
3737
environment:
3838
HOME: $SNAP_USER_COMMON
3939
wallet:
40-
command: bitcoin-wallet
40+
command: bin/bitcoin-wallet
4141
plugs: [home, removable-media]
4242
environment:
4343
HOME: $SNAP_USER_COMMON
4444
util:
45-
command: bitcoin-util
45+
command: bin/bitcoin-util
4646
environment:
4747
HOME: $SNAP_USER_COMMON
4848

0 commit comments

Comments
 (0)