mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33693: ci: use pycapnp 2.2.1

Browse Source 
53b34c80c6 ci: use pycapnp 2.2.1 in mac native job (fanquake)
865432869c ci: remove Python version comment from mac config (fanquake)

Pull request description:

  Switch to using v2.2.1 in the mac native job. Remove the git clone & install step.

ACKs for top commit:
  maflcko:
    lgtm ACK 53b34c80c6
  l0rinc:
    crACK 53b34c80c6
  hebasto:
    ACK 53b34c80c6.

Tree-SHA512: e756694c14431aacb3e48104331da88285c7500b4c4599c698f50d721d428ffe61258be075ef526b93c15aa3331f38535ca95249a2ef3ebfc804f61479095d9b
This commit is contained in:
merge-script committed 2025-10-29 10:00:57 +00:00
2 parents 3bb30658e6 53b34c80c6
commit dd82c6c5d0
3 files changed
+3 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/ci.yml
-5
View File
@@ -157,11 +157,6 @@ jobs:
brew install --quiet python@3 || brew link --overwrite python@3 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 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 - name: Set Ccache directory
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV" run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
ci/test/00_setup_env_mac_native.sh
+1 -3
View File
@@ -6,10 +6,8 @@
export LC_ALL=C.UTF-8 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 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 pycapnp zmq"
export GOAL="install deploy" export GOAL="install deploy"
export CMAKE_GENERATOR="Ninja" 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'" export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DREDUCE_EXPORTS=ON -DCMAKE_EXE_LINKER_FLAGS='-Wl,-stack_size -Wl,0x80000'"
test/README.md
+2 -2
View File
@@ -37,7 +37,7 @@ The ZMQ functional test requires a python ZMQ library. To install it:
The IPC functional test requires a python IPC library. `pip3 install pycapnp` may work, but if not, install it from source: The IPC functional test requires a python IPC library. `pip3 install pycapnp` may work, but if not, install it from source:
```sh ```sh
git clone -b v2.1.0 https://github.com/capnproto/pycapnp git clone -b v2.2.1 https://github.com/capnproto/pycapnp
pip3 install ./pycapnp pip3 install ./pycapnp
``` ```
@@ -46,7 +46,7 @@ Depending on the system, it may be necessary to install and run in a venv:
```sh ```sh
python -m venv venv python -m venv venv
git clone -b v2.1.0 https://github.com/capnproto/pycapnp git clone -b v2.2.1 https://github.com/capnproto/pycapnp
venv/bin/pip3 install ./pycapnp -C force-bundled-libcapnp=True venv/bin/pip3 install ./pycapnp -C force-bundled-libcapnp=True
venv/bin/python3 build/test/functional/interface_ipc.py venv/bin/python3 build/test/functional/interface_ipc.py
``` ```