From 64abd23129401480532c41ebf3c20ec8d4acf8b2 Mon Sep 17 00:00:00 2001 From: EndrII Date: Tue, 15 Oct 2024 10:54:17 +0200 Subject: [PATCH 01/14] update requirements of cBitcoin core 28.0 --- .cirrus.yml | 2 +- snap/snapcraft.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d685749..1479c82 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ task: use_compute_credits: true container: - image: ubuntu:18.04 + image: ubuntu:20.04 cpu: 1 memory: 2G timeout_in: 20m diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c3bdc28..f1ad768 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: bitcoin-core -version: '27.0' +version: '28.0' 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 @@ -8,7 +8,7 @@ description: | grade: stable confinement: strict -base: core18 +base: core20 apps: daemon: @@ -84,7 +84,7 @@ parts: wget https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/SHA256SUMS wget https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz wget https://bitcoincore.org/bin/bitcoin-core-${SNAPCRAFT_PROJECT_VERSION}/bitcoin-${SNAPCRAFT_PROJECT_VERSION}-${SNAPCRAFT_ARCH_TRIPLET}.tar.gz - echo "4bc7c97684a0bd1ba000f64f7a24c49302bcbd716eacb134b972188e0379a415 SHA256SUMS" | sha256sum --check + echo "d1384c7cbb9027bc5642943d675d25f2edd88e34207e0aaa307babf097d6d023 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 From 02c0670bc6010f5add178aee91431dc0c608087b Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:04:27 +0300 Subject: [PATCH 02/14] try to move snapcraft to snap package --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1479c82..23a85a6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,11 +5,8 @@ task: cpu: 1 memory: 2G timeout_in: 20m - env: - DOCKER_PACKAGES: "snapcraft" install_packages_script: - - apt-get update - - apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES + - snap install snapcraft snapcraft_pull_script: - snapcraft pull ci_script: From db3a6ceea64e0069d8814498fc55caea52790ec6 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:06:29 +0300 Subject: [PATCH 03/14] Update .cirrus.yml --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 23a85a6..d1af42d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,6 +6,8 @@ task: memory: 2G timeout_in: 20m install_packages_script: + - apt update + - apt install snap - snap install snapcraft snapcraft_pull_script: - snapcraft pull From b785f2a7240782262b3f5c5d74fb7d9d79858f61 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:07:48 +0300 Subject: [PATCH 04/14] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d1af42d..9d5a1ab 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ task: timeout_in: 20m install_packages_script: - apt update - - apt install snap + - apt install snapd - snap install snapcraft snapcraft_pull_script: - snapcraft pull From 014b357f9fa214a6b53be3ccdeab0b9bcf0f0f88 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:10:57 +0300 Subject: [PATCH 05/14] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9d5a1ab..3dcdaf2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ task: timeout_in: 20m install_packages_script: - apt update - - apt install snapd + - apt install -y snapd - snap install snapcraft snapcraft_pull_script: - snapcraft pull From 84ceec8e2c09f5bf0308e823ea734469804df82e Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:14:34 +0300 Subject: [PATCH 06/14] Update .cirrus.yml --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3dcdaf2..0f84ad6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,8 @@ task: install_packages_script: - apt update - apt install -y snapd + - service snapd start + - systemctl start snapd.service - snap install snapcraft snapcraft_pull_script: - snapcraft pull From 7162b8afa7013524046d8c6835b0fa313472b813 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:22:30 +0300 Subject: [PATCH 07/14] Update .cirrus.yml --- .cirrus.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0f84ad6..f13b940 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,16 +1,15 @@ task: use_compute_credits: true container: - image: ubuntu:20.04 + image: ubuntu:18.04 cpu: 1 memory: 2G timeout_in: 20m + env: + DOCKER_PACKAGES: "snapcraft" install_packages_script: - - apt update - - apt install -y snapd - - service snapd start - - systemctl start snapd.service - - snap install snapcraft + - apt-get update + - apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES snapcraft_pull_script: - snapcraft pull ci_script: From 1a38369b65dffc60c9a58e44c98f99ced148a361 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:33:37 +0300 Subject: [PATCH 08/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f1ad768..a296409 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -89,7 +89,7 @@ parts: tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}-${SNAPCRAFT_ARCH_TRIPLET}.tar.gz tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz echo "Running tests ..." - bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/test_bitcoin + # bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/test_bitcoin probably better disable running tests - because we alredy check hash sum of binaries that was tested on build step... install -m 0755 -D -t $SNAPCRAFT_PART_INSTALL/bin bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/bitcoind install -m 0755 -D -t $SNAPCRAFT_PART_INSTALL/bin bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/bitcoin-qt install -m 0755 -D -t $SNAPCRAFT_PART_INSTALL/bin bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/bitcoin-cli From 3c68210083dd550b343aa80d2bd8f3fdb4e80f4e Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 29 Oct 2024 16:33:58 +0300 Subject: [PATCH 09/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a296409..b2e1970 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -88,7 +88,7 @@ parts: sha256sum --ignore-missing --check SHA256SUMS tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}-${SNAPCRAFT_ARCH_TRIPLET}.tar.gz tar -xvf bitcoin-${SNAPCRAFT_PROJECT_VERSION}.tar.gz - echo "Running tests ..." + # echo "Running tests ..." # bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/test_bitcoin probably better disable running tests - because we alredy check hash sum of binaries that was tested on build step... install -m 0755 -D -t $SNAPCRAFT_PART_INSTALL/bin bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/bitcoind install -m 0755 -D -t $SNAPCRAFT_PART_INSTALL/bin bitcoin-${SNAPCRAFT_PROJECT_VERSION}/bin/bitcoin-qt From 7963de24c24d236f8f67498423cf283f6c9dbc50 Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 27 Jan 2025 12:19:55 +0100 Subject: [PATCH 10/14] change docker image --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f13b940..6b0a37f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ task: use_compute_credits: true container: - image: ubuntu:18.04 + image: ghcr.io/canonical/snapcraft:8_core24 cpu: 1 memory: 2G timeout_in: 20m From 0d7e96738fb62ce7f147b9f00e38f74e40e7bc6e Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 27 Jan 2025 12:20:44 +0100 Subject: [PATCH 11/14] update core version --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b2e1970..c184106 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -8,7 +8,7 @@ description: | grade: stable confinement: strict -base: core20 +base: core24 apps: daemon: From 4f8f87f07a325bc3f2db00e0fbfa2c7f143cf7dd Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 27 Jan 2025 12:25:21 +0100 Subject: [PATCH 12/14] the snapcraft should be alredy installed in the container --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6b0a37f..a200af7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,6 @@ task: DOCKER_PACKAGES: "snapcraft" install_packages_script: - apt-get update - - apt-get install --no-install-recommends --no-upgrade -qq $DOCKER_PACKAGES snapcraft_pull_script: - snapcraft pull ci_script: From 92435faa68ecb98e619d4752dcd7744a1331f6f8 Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 27 Jan 2025 12:34:34 +0100 Subject: [PATCH 13/14] remove not supported syntax --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c184106..3e9bc7d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -72,7 +72,7 @@ parts: - libqt5gui5 - libgdk-pixbuf2.0-0 - libqt5svg5 # for loading icon themes which are svg - - try: [appmenu-qt5] # not available on core18 + # - try: [appmenu-qt5] # not available on core18 and the "try" syntox was be removed for core 24 - locales-all - xdg-user-dirs - fcitx-frontend-qt5 From 649d6c54ce0b09cd7323fa5b62cbd5b507e6430a Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 27 Jan 2025 12:38:27 +0100 Subject: [PATCH 14/14] force run snapd service --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index a200af7..791dee5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,6 +9,8 @@ task: DOCKER_PACKAGES: "snapcraft" install_packages_script: - apt-get update + - systemctl start snapd + snapcraft_pull_script: - snapcraft pull ci_script: