From 80f1575b6395345415824e4e3d13e7dc4a28afab Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 23 Aug 2025 12:04:44 +0100 Subject: [PATCH 1/2] OpenBSD: Switch "system libs" job to Ninja The next commit will require Ninja to build the `capnproto` package from source. --- .github/workflows/openbsd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml index 1ba784f..2982bb0 100644 --- a/.github/workflows/openbsd.yml +++ b/.github/workflows/openbsd.yml @@ -46,7 +46,7 @@ jobs: uses: vmactions/openbsd-vm@v1 with: envs: 'CCACHE_COMPILERCHECK CCACHE_DIR CCACHE_MAXSIZE' - prepare: pkg_add -v cmake git ccache boost libevent sqlite3 zeromq python py3-zmq + prepare: pkg_add -v cmake ninja git ccache boost libevent sqlite3 zeromq python py3-zmq run: git config --global --add safe.directory ${{ github.workspace }} sync: 'rsync' copyback: false @@ -60,7 +60,7 @@ jobs: - name: Generate buildsystem run: | cd ${{ github.workspace }} - cmake -B build -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON + cmake -B build -DCMAKE_GENERATOR="Ninja" -DWITH_ZMQ=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWERROR=ON - name: Build uses: ./ci/nightly/.github/actions/build-with-ccache From 67c4e39cf90a10a3820826f35ad237e174389235 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 23 Aug 2025 12:06:35 +0100 Subject: [PATCH 2/2] OpenBSD: Install Cap'n Proto package Required since bitcoin/bitcoin#31802 was merged. --- .github/workflows/openbsd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml index 2982bb0..b261ca4 100644 --- a/.github/workflows/openbsd.yml +++ b/.github/workflows/openbsd.yml @@ -46,7 +46,10 @@ jobs: uses: vmactions/openbsd-vm@v1 with: envs: 'CCACHE_COMPILERCHECK CCACHE_DIR CCACHE_MAXSIZE' - prepare: pkg_add -v cmake ninja git ccache boost libevent sqlite3 zeromq python py3-zmq + prepare: | + pkg_add -v cmake ninja git ccache boost libevent sqlite3 zeromq python py3-zmq + git clone --depth=1 https://codeberg.org/OpenBSD/ports.git /usr/ports + make -C /usr/ports/devel/capnproto/ install run: git config --global --add safe.directory ${{ github.workspace }} sync: 'rsync' copyback: false