Skip to content

Commit f1fad39

Browse files
committed
Merge #195: ci: Add openbsd
eed42f2 ci: Bump all tasks to actions/checkout@v5 (marco) 486a510 ci: Remove ancient and problematic -lstdc++fs in mpexample (marco) dd40897 Add missing thread include (marco) 98414e7 ci: Add openbsd (marco) Pull request description: Requested in bitcoin/bitcoin#33219 (comment) ACKs for top commit: hebasto: ACK eed42f2. ryanofsky: Code review ACK eed42f2. Nice changes! Tree-SHA512: 2d6d7513b172cc606c69d6b06e3fa12ab3e2a127d078766f569be6fab92d45bd49fe80ad0ca10547cd162eb87f73956b3a8e105a403e8035edbd75896e34e7fe
2 parents cb170d4 + eed42f2 commit f1fad39

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,35 @@ on:
55
pull_request:
66

77
jobs:
8+
build-openbsd:
9+
runs-on: ubuntu-latest
10+
name: build • openbsd
11+
defaults:
12+
run:
13+
shell: openbsd {0}
14+
steps:
15+
- uses: actions/checkout@v5
16+
17+
- name: Start OpenBSD VM
18+
uses: vmactions/openbsd-vm@v1
19+
with:
20+
prepare: |
21+
pkg_add -v cmake ninja git python bash
22+
run: |
23+
git clone --depth=1 https://codeberg.org/OpenBSD/ports.git /usr/ports
24+
sync: 'rsync'
25+
copyback: false
26+
27+
- name: Install capnproto
28+
run: |
29+
cd /usr/ports/devel/capnproto/
30+
make install
31+
32+
- name: Run CI script
33+
run: |
34+
cd ${{ github.workspace }}
35+
CI_CONFIG="ci/configs/openbsd.bash" bash ci/scripts/ci.sh
36+
837
build:
938
runs-on: ubuntu-latest
1039

@@ -16,7 +45,7 @@ jobs:
1645
name: build • ${{ matrix.config }}
1746

1847
steps:
19-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v5
2049

2150
- name: Install Nix
2251
uses: cachix/install-nix-action@v31 # 2025-05-27, from https://github.com/cachix/install-nix-action/tags

ci/configs/openbsd.bash

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CI_DESC="CI config for OpenBSD"
2+
CI_DIR=build-openbsd
3+
export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter"
4+
CMAKE_ARGS=(-G Ninja)
5+
BUILD_ARGS=(-k 0)

example/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ add_executable(mpexample
2424
target_capnp_sources(mpexample ${CMAKE_CURRENT_SOURCE_DIR} init.capnp calculator.capnp printer.capnp)
2525
target_include_directories(mpexample PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
2626
target_link_libraries(mpexample PRIVATE Threads::Threads)
27-
target_link_libraries(mpexample PRIVATE stdc++fs)
2827

2928
add_custom_target(mpexamples DEPENDS mpexample mpcalculator mpprinter)

src/mp/util.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <sys/socket.h>
1717
#include <sys/wait.h>
1818
#include <system_error>
19+
#include <thread> // NOLINT(misc-include-cleaner) // IWYU pragma: keep
1920
#include <unistd.h>
2021
#include <utility>
2122
#include <vector>

0 commit comments

Comments
 (0)