Switch to using v2.2.1 in the mac native job. Remove the git clone & install step.
ci: use pycapnp 2.2.1 #33693
pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:pycapnp_2_2_0 changing 3 files +3 −10-
fanquake commented at 2:40 AM on October 24, 2025: member
- DrahtBot added the label Tests on Oct 24, 2025
-
DrahtBot commented at 2:40 AM on October 24, 2025: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage & Benchmarks
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33693.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
-
maflcko commented at 7:37 AM on October 24, 2025: member
unrelated nit: I think you can also remove this comment:
# Homebrew's python@3.12 is marked as externally managed (PEP 668). # Therefore, `--break-system-packages` is needed.Since, homebrew has updated the python version number, and the comment isn't added to any of the other
--break-system-packagesoptions where set. -
fanquake commented at 7:44 AM on October 24, 2025: member
I think you can also remove this comment:
Added a removal.
-
maflcko commented at 7:49 AM on October 24, 2025: member
lgtm ACK 8088643a616355b941fabbd584013c5969c0d1dc
-
hebasto commented at 11:36 AM on October 25, 2025: member
The following diff also seems to work, unless I’ve missed minor issues or pitfalls already discussed in in #33201:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a05e8f9648..1c69cc5437 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,11 +157,6 @@ jobs: brew install --quiet python@3 || brew link --overwrite python@3 brew install --quiet coreutils ninja pkgconf gnu-getopt ccache boost libevent zeromq qt@6 qrencode capnp - - name: Install Python packages - run: | - git clone -b v2.1.0 https://github.com/capnproto/pycapnp - pip3 install ./pycapnp -C force-bundled-libcapnp=True --break-system-packages - - name: Set Ccache directory run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV" diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index 41a3bc4587..3cab6555b0 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 # Homebrew's python@3.12 is marked as externally managed (PEP 668). # Therefore, `--break-system-packages` is needed. export CONTAINER_NAME="ci_mac_native" # macos does not use a container, but the env var is needed for logging -export PIP_PACKAGES="--break-system-packages zmq" +export PIP_PACKAGES="--break-system-packages zmq pycapnp" export GOAL="install deploy" export CMAKE_GENERATOR="Ninja" export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DREDUCE_EXPORTS=ON -DCMAKE_EXE_LINKER_FLAGS='-Wl,-stack_size -Wl,0x80000'" -
ci: remove Python version comment from mac config 865432869c
-
53b34c80c6
ci: use pycapnp 2.2.1 in mac native job
Drop using the git clone & install.
- fanquake force-pushed on Oct 27, 2025
- fanquake requested review from maflcko on Oct 28, 2025
-
maflcko commented at 9:39 PM on October 28, 2025: member
lgtm ACK 53b34c80c631ee3f5ae652315592924f6935e0f1
- hebasto approved
-
hebasto commented at 10:58 PM on October 28, 2025: member
ACK 53b34c80c631ee3f5ae652315592924f6935e0f1.
-
l0rinc commented at 11:04 PM on October 28, 2025: contributor
crACK 53b34c80c631ee3f5ae652315592924f6935e0f1
- fanquake merged this on Oct 29, 2025
- fanquake closed this on Oct 29, 2025
- fanquake deleted the branch on Oct 29, 2025