Skip to content

ci: revive the BSD workflows #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neilpang wants to merge 6 commits into
base: master
Choose a base branch
from
Open

ci: revive the BSD workflows #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1259bed
ci: revive the BSD workflows
Aug 20, 2026
edc74b4
configure: accept msgpack-c as well as msgpack
Aug 20, 2026
1dc5062
ci: build when the build system changes
Aug 20, 2026
c02570f
ci: install the missing macOS dependencies
Aug 20, 2026
7a53c59
ci: cache the prepared VM images
Aug 30, 2026
d6e4497
ci: pin the OpenBSD port patches to a fixed ports commit
Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/DragonflyBSD.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/DragonflyBSD.yml'
pull_request:
branches:
Expand All @@ -15,19 +17,23 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/DragonflyBSD.yml'



jobs:
DragonflyBSD:
runs-on: macos-12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: vmactions/dragonflybsd-vm@v0
- uses: actions/checkout@v7
- uses: vmactions/dragonflybsd-vm@v1
with:
release: "6"
cache-after-prepare: true
prepare: |
pkg install -y automake autoconf libtool pkgconf libevent msgpack libssh gsed
pkg install -y automake autoconf libtool pkgconf libevent msgpack-c libssh gsed
usesh: true
run: |
gsed -i "s/OK/0/g" tty-term.c
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/FreeBSD.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/FreeBSD.yml'
pull_request:
branches:
Expand All @@ -15,19 +17,23 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/FreeBSD.yml'



jobs:
FreeBSD:
runs-on: macos-12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: vmactions/freebsd-vm@v0
- uses: actions/checkout@v7
- uses: vmactions/freebsd-vm@v1
with:
release: "15"
cache-after-prepare: true
prepare: |
pkg install -y automake autoconf libtool pkgconf libevent msgpack libssh
pkg install -y automake autoconf libtool pkgconf libevent msgpack-c libssh
usesh: true
run: |
autoupdate
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/MacOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/MacOS.yml'
pull_request:
branches:
Expand All @@ -15,6 +17,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/MacOS.yml'


Expand All @@ -23,14 +27,14 @@ jobs:
MacOS:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- run: |
brew install automake msgpack libssh
brew install automake autoconf libtool pkg-config libevent msgpack libssh
autoupdate
./autogen.sh
./configure
make
make install
sudo make install



Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/NetBSD.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/NetBSD.yml'
pull_request:
branches:
Expand All @@ -15,18 +17,27 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/NetBSD.yml'



jobs:
NetBSD:
runs-on: macos-12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: vmactions/netbsd-vm@v0
- uses: actions/checkout@v7
- uses: vmactions/netbsd-vm@v1
with:
release: "11"
cache-after-prepare: true
prepare: |
# The image's default PKG_PATH falls back to a 9.0 package set,
# which yields binaries linked against a libcrypto this host
# does not have. Point it at the running release instead.
PKG_PATH="https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/$(uname -r)/All/"
export PKG_PATH
pkg_add automake autoconf libtool pkgconf libevent msgpack libssh
usesh: true
run: |
Expand Down
35 changes: 22 additions & 13 deletions .github/workflows/OpenBSD.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/OpenBSD.yml'
pull_request:
branches:
Expand All @@ -15,31 +17,38 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/OpenBSD.yml'



jobs:
OpenBSD:
runs-on: macos-12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: vmactions/openbsd-vm@v0
- uses: actions/checkout@v7
- uses: vmactions/openbsd-vm@v1
with:
release: "7"
cache-after-prepare: true
prepare: |
pkg_add automake-1.16.3 autoconf-2.71 libtool pkgconf libevent msgpack libssh curl
pkg_add automake-1.18.1 autoconf-2.72p0 libtool libevent msgpack libssh curl
usesh: true
run: |
# The port was removed from the ports tree (a916bade,
# "Remove sysutils/tmate"), so pin its patches to the
# last commit that still has them.
sed -i 's,<event.h>,<event2/event.h>,' *.[ch]
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-Makefile_am | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-server_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-tmate-debug_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-tmate_h | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-tmux_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-tmux_h | patch
curl https://raw.githubusercontent.com/openbsd/ports/master/sysutils/tmate/patches/patch-osdep-openbsd_c | patch
export AUTOMAKE_VERSION=1.16
export AUTOCONF_VERSION=2.71
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-Makefile_am | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-server_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-tmate-debug_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-tmate_h | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-tmux_c | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-tmux_h | patch
curl https://raw.githubusercontent.com/openbsd/ports/c8ae5de7b7e367e8eadd1e671743eb5705c12769/sysutils/tmate/patches/patch-osdep-openbsd_c | patch
export AUTOMAKE_VERSION=1.18
export AUTOCONF_VERSION=2.72
autoupdate
./autogen.sh
./configure
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/Ubuntu.yml'
pull_request:
branches:
Expand All @@ -15,6 +17,8 @@ on:
- '**.c'
- '**.h'
- 'compat/*'
- 'configure.ac'
- 'Makefile.am'
- '.github/workflows/Ubuntu.yml'


Expand Down
17 changes: 14 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,29 @@ if test "x$found_utempter" = xyes; then
fi
fi

# msgpack-c 4.x renamed the pkg-config module from msgpack to msgpack-c.
# Try the new name first, then the old one, so both are accepted.
PKG_CHECK_MODULES(
MSGPACK,
msgpack >= 1.1.0,
msgpack-c >= 1.1.0,
[
CPPFLAGS="$MSGPACK_CFLAGS $CPPFLAGS"
LIBS="$MSGPACK_LIBS $LIBS"
found_msgpack=yes
],
found_msgpack=no
[PKG_CHECK_MODULES(
MSGPACK,
msgpack >= 1.1.0,
[
CPPFLAGS="$MSGPACK_CFLAGS $CPPFLAGS"
LIBS="$MSGPACK_LIBS $LIBS"
found_msgpack=yes
],
found_msgpack=no
)]
)
if test "x$found_msgpack" = xno; then
AC_MSG_ERROR("msgpack >= 1.1.0 not found")
AC_MSG_ERROR("msgpack >= 1.1.0 not found (tried msgpack-c and msgpack)")
fi

PKG_CHECK_MODULES(
Expand Down
Loading