From cc3675280bfa73e145fd05acc4b1743763aa6ecc Mon Sep 17 00:00:00 2001 From: Ryan Ofsky Date: Wed, 26 Aug 2026 09:35:19 -0400 Subject: [PATCH 1/2] ci: bump cmake version to 4.3.4 in newdeps job Update cmake from 4.1.1 to 4.3.4, including the corresponding sha256 hash in shell.nix. Suggested-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Reference: https://github.com/bitcoin-core/libmultiprocess/pull/212#pullrequestreview-5002523847 Co-Authored-By: Claude Sonnet 4.6 --- ci/configs/newdeps.bash | 2 +- shell.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/configs/newdeps.bash b/ci/configs/newdeps.bash index e05913a6..e6e5fe1d 100644 --- a/ci/configs/newdeps.bash +++ b/ci/configs/newdeps.bash @@ -2,5 +2,5 @@ CI_DESC="CI job using newest Cap'n Proto and cmake versions" CI_DIR=build-newdeps export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-error=array-bounds" CAPNP_CHECKOUT=master -NIX_ARGS=(--argstr capnprotoVersion "none" --argstr cmakeVersion "4.1.1") +NIX_ARGS=(--argstr capnprotoVersion "none" --argstr cmakeVersion "4.3.4") BUILD_ARGS=(-k) diff --git a/shell.nix b/shell.nix index 17789f31..1fbfda51 100644 --- a/shell.nix +++ b/shell.nix @@ -56,6 +56,7 @@ let cmakeHashes = { "3.12.4" = "sha256-UlVYS/0EPrcXViz/iULUcvHA5GecSUHYS6raqbKOMZQ="; "4.1.1" = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI="; + "4.3.4" = "sha256-/e/4l7nrSddkU58rHtxut+FEDfMlZ4qXwZeEmekxrdo="; }; gcc = if gccVersion == null then null else builtins.getAttr ("gcc" + gccVersion) pkgs; cmakeBuild = if cmakeVersion == null then pkgs.cmake else (pkgs.cmake.overrideAttrs (old: { From 766867fb326a8cc11aa4c0d6142288609b9bce72 Mon Sep 17 00:00:00 2001 From: Ryan Ofsky Date: Tue, 25 Aug 2026 17:05:11 -0400 Subject: [PATCH 2/2] ci: clarify CAPNP_CHECKOUT=master is the v1.x release branch capnproto's default branch switched to v2, so "master" is non-obvious. Suggested-by: MarcoFalke Reference: https://github.com/bitcoin-core/libmultiprocess/pull/212#discussion_r3827402335 Co-Authored-By: Claude Sonnet 4.6 --- ci/configs/newdeps.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/configs/newdeps.bash b/ci/configs/newdeps.bash index e6e5fe1d..a86f9dee 100644 --- a/ci/configs/newdeps.bash +++ b/ci/configs/newdeps.bash @@ -1,6 +1,6 @@ CI_DESC="CI job using newest Cap'n Proto and cmake versions" CI_DIR=build-newdeps export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-error=array-bounds" -CAPNP_CHECKOUT=master +CAPNP_CHECKOUT=master # This is the v1.x release branch NIX_ARGS=(--argstr capnprotoVersion "none" --argstr cmakeVersion "4.3.4") BUILD_ARGS=(-k)