branch='trunk'
if ! command -v git >/dev/null 2>&1; then
echo 'byggsteg: git is not on this deployment PATH, so the clone cannot be updated' >&2
exit 1
fi
if ! cd "$dir"; then
echo "byggsteg: cannot enter the clone $dir" >&2
exit 1
fi
root=$(git rev-parse --show-toplevel 2>/dev/null)
if [ "$root" != "$(pwd -P)" ]; then
echo "byggsteg: $dir is not a git checkout; remove it and the next run clones it again" >&2
exit 1
fi
if ! origin=$(git remote get-url origin 2>/dev/null); then
echo "byggsteg: $dir has no origin remote to fetch $branch from" >&2
exit 1
fi
before=$(git rev-parse --short HEAD 2>/dev/null) || before=none
attempt=1
while :; do
if GIT_TERMINAL_PROMPT=0 git fetch --quiet origin "+refs/heads/$branch:refs/remotes/origin/$branch"; then
break
fi
if [ "$attempt" -ge 3 ]; then
echo "byggsteg: could not fetch $branch from $origin after 3 attempts; is the branch still there, and is the remote reachable?" >&2
exit 1
fi
echo "byggsteg: fetching $branch from $origin failed; retrying in $((attempt * 2))s" >&2
sleep $((attempt * 2))
attempt=$((attempt + 1))
done
if ! git checkout --quiet --force -B "$branch" FETCH_HEAD; then
echo "byggsteg: fetched $branch from $origin but could not check it out" >&2
exit 1
fi
after=$(git rev-parse --short HEAD)
if [ "$before" = "$after" ]; then
echo "byggsteg: $branch was already at $after"
else
echo "byggsteg: $branch moved from $before to $after"
fi
byggsteg: trunk moved from 1421fd4 to aa39961
setupuname -a✓ succeeded1 lines · 0.0s
Linux wolk-jjba 7.2.11-gnu #1 SMP PREEMPT_DYNAMIC 1 x86_64 GNU/Linux
commit aa39961f36aa977a59ce42b21e7c2dd13bfd2f22
Author: Josep Bigorra <jjbigorra@gmail.com>
Date: Mon Nov 16 11:09:56 2026 +0100
feat(rust): port the asynchronous command runner
Move program polling and launching to Rust with GSubprocess and the GLib
main context: text output with trailing line endings removed, optional
stdin for secrets that must not appear in ps, exit status, and a
byte-exact reader for NUL-separated menu output. Also port the explicit
WHELK_RETV prefix and the reaping fire-and-forget spawn.
AI: Codebuff (Buffy) wrote this change; the operator is the author of record.
🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>
M rust/README.md
A rust/src/command.rs
M rust/src/lib.rs
A rust/tests/command.rs
testmaak test✗ failed90 lines · 4.0s
The Meson build system
Version: 1.9.0
Source dir: /etc/byggsteg/job-clone/whelk/trunk
Build dir: /etc/byggsteg/job-clone/whelk/trunk/build
Build type: native build
Project name: whelk
Project version: 0.34.0
C compiler for the host machine: cc (gcc 14.3.0 "cc (GCC) 14.3.0")
C linker for the host machine: cc ld.bfd 2.44
Host machine cpu family: x86_64
Host machine cpu: x86_64
Compiler for C supports arguments -Wpedantic: YES
Compiler for C supports arguments -Wshadow: YES
Compiler for C supports arguments -Wstrict-prototypes: YES
Compiler for C supports arguments -Wmissing-prototypes: YES
Compiler for C supports arguments -Wredundant-decls: YES
Compiler for C supports arguments -Wimplicit-fallthrough: YES
Compiler for C supports arguments -Wvla: YES
Compiler for C supports arguments -Wundef: YES
Compiler for C supports arguments -Wformat=2: YES
Compiler for C supports arguments -Wformat-security: YES
Compiler for C supports arguments -Werror=implicit-function-declaration: YES
Compiler for C supports arguments -Werror=incompatible-pointer-types: YES
Compiler for C supports arguments -Werror=int-conversion: YES
Compiler for C supports arguments -Wno-overlength-strings: YES
Compiler for C supports arguments -Wjump-misses-init: YES
Found pkg-config: YES (/gnu/store/cxnq09q9j0zh91lh2i8lialsag5y7wpp-profile/bin/pkg-config) 0.29.2
Run-time dependency gtk4 found: YES 4.22.1
Run-time dependency guile-3.0 found: YES 3.0.9
Run-time dependency gtk4-layer-shell-0 found: YES 1.3.0
Run-time dependency wayland-client found: YES 1.26.0
Run-time dependency gio-unix-2.0 found: YES 2.86.5
Run-time dependency pam found: YES 1.7.2
Library m found: YES
Run-time dependency x11 found: YES 1.8.14
Run-time dependency xrandr found: YES 1.5.4
Library dl found: YES
Build-time dependency gio-2.0 found: YES 2.86.5
Program glib-compile-resources found: YES (/gnu/store/cxnq09q9j0zh91lh2i8lialsag5y7wpp-profile/bin/glib-compile-resources)
Program wayland-scanner found: YES (/gnu/store/cxnq09q9j0zh91lh2i8lialsag5y7wpp-profile/bin/wayland-scanner)
Program sh found: YES (/gnu/store/c6kh9i8hyi2ydkcykwi6fwfj0808hh82-bash-minimal-5.2.37/bin/sh)
Program sh found: YES (/gnu/store/c6kh9i8hyi2ydkcykwi6fwfj0808hh82-bash-minimal-5.2.37/bin/sh)
Program gtk4-broadwayd found: NO
Program guile found: YES (/gnu/store/cxnq09q9j0zh91lh2i8lialsag5y7wpp-profile/bin/guile)
Build targets in project: 48
Found ninja-1.13.2 at /gnu/store/cxnq09q9j0zh91lh2i8lialsag5y7wpp-profile/bin/ninja
ninja: Entering directory `build'
[1/397] Generating river-status-client-protocol.h with a custom command
[2/397] Generating wlr-gamma-control-client-protocol.h with a custom command
[3/397] Generating whelk-resources_h with a custom command
[4/397] Generating whelk-resources_c with a custom command
[5/397] Generating river-status-client-protocol.c with a custom command
[6/397] Generating wlr-gamma-control-client-protocol.c with a custom command
[7/397] Compiling C object whelk.p/meson-generated_.._river-status-client-protocol.c.o
[8/397] Compiling C object whelk.p/meson-generated_.._wlr-gamma-control-client-protocol.c.o
[9/397] Compiling C object whelk.p/meson-generated_.._whelk-resources.c.o
[10/397] Compiling C object whelk.p/src_about.c.o
FAILED: [code=1] whelk.p/src_about.c.o
cc -Iwhelk.p -I. -I.. -I../src -I/gnu/store/g1wbkj5wd33b4hxjpm0ji9iwikm7ysk7-linux-pam-1.7.2/include -fvisibility=hidden -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -Werror -std=gnu17 -O3 -Wpedantic -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wimplicit-fallthrough -Wvla -Wundef -Wformat=2 -Wformat-security -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=int-conversion -Wno-overlength-strings -Wjump-misses-init -D_GNU_SOURCE '-DWHELK_PAM_LIBDIR="/gnu/store/g1wbkj5wd33b4hxjpm0ji9iwikm7ysk7-linux-pam-1.7.2/lib"' -DHAVE_X11 -DHAVE_XRANDR -DHAVE_PAM '-DWHELK_SCHEME_DIR="/usr/local/share/guile/site/3.0"' '-DDEFAULT_GSK_RENDERER="gl"' '-DPACKAGE_VERSION="0.34.0"' -fPIE -isystem/gnu/store/5g8ismq8wnsnxygpblfn3nn0skl3r68p-libxrandr-1.5.4/include -pthread -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include/gio-unix-2.0 -mfpmath=sse -msse -msse2 -isystem/gnu/store/hak3d9j9ydrwid2pwr5nv99kkwapncs3-gtk4-layer-shell-1.3.0/include/gtk4-layer-shell -isystem/gnu/store/izb9m7xrcjkxzv5kzi930gwdqvfl3j5d-wayland-1.26.0/include -isystem/gnu/store/ddz7grx7w2yg4dwljx5f64mam8vdfvhl-guile-3.0.9/include/guile/3.0 -mfpmath=sse -msse -msse2 -isystem/gnu/store/1ndq0j7wlar8alz03w9fr3kch2a8lgwx-gtk-4.22.1/include/gtk-4.0 -isystem/gnu/store/m6nk9hm4b4xb5cf8cbji4sici37wi9n8-pango-1.57.1/include/pango-1.0 -isystem/gnu/store/74jvgyaddhswxmfxhcdkzm93npr06qws-fribidi-1.0.12/include/fribidi -isystem/gnu/store/3k27039qxq2lvi104ypypykdk8sbw7rx-libthai-0.1.29/include -isystem/gnu/store/mj76wwk62b385fajzhf13jn810y86nvk-libdatrie-0.2.13/include -isystem/gnu/store/8537xiwqf1hlj4qb00lpkpkh2hhwjx3z-libxft-2.3.8/include -isystem/gnu/store/zzvgll4phj3mf95xsq2zy5p90bviqsn7-harfbuzz-11.4.4/include/harfbuzz -isystem/gnu/store/rhbr5bdh0wjgsk1d70cimvffjyf0v13r-graphite2-1.3.13/include -isystem/gnu/store/52i28293snqwxh4ssfk0mawvd9jf5vkm-gdk-pixbuf-2.44.5/include/gdk-pixbuf-2.0 -isystem/gnu/store/vwr84bsi48w6q6w4h8lhz8rc0z87z3xk-libtiff-4.7.2/include -isystem/gnu/store/h8nzyrnxm84h923xygy6iyyvwnxkwijg-xz-5.4.5/include -isystem/gnu/store/zyw34sx7scpj93nwgaa48r0n6jf7bc83-libjpeg-turbo-2.1.4/include -isystem/gnu/store/xjqpcdfgjk6xpgr84ck23kw83pqy2qhf-cairo-1.18.4/include/cairo -isystem/gnu/store/z65wq7k473q19gibaspmli7linllb89h-fontconfig-minimal-2.17.1/include -isystem/gnu/store/24jbvj0wi1sgav4lxbzr923s72xpmzkn-expat-2.8.5/include -isystem/gnu/store/9sbbkyr0y8s0wqhryixqyv5xnjf8vgfb-freetype-2.13.3/include/freetype2 -isystem/gnu/store/wc0hf5j4vh8r8y0xgylh88qgqrcjyh0h-libpng-1.6.59/include/libpng16 -isystem/gnu/store/29fyfw4q4xka9cdxz0lmhjhsq3hyinf6-libxext-1.3.6/include -isystem/gnu/store/y33rgzppgxf813ghvqqhx8rv6jd8ql77-libxrender-0.9.13/include -isystem/gnu/store/rsvvy73r1d6kj9kf1bs10bfhrz3ax4za-libx11-1.8.14/include -isystem/gnu/store/aynknl3n0x2ppmc3f9mafnasg5nhljlg-libxcb-1.17.0/include -isystem/gnu/store/5i3fsjax5si32mi99xrwq8h1ybz0zf5i-libxau-1.0.12/include -isystem/gnu/store/r94nvsl0j55f0cp5lifjhfzjb0xp58h3-libxdmcp-1.1.5/include -isystem/gnu/store/8hl60g8qc8593znwx9418s0f2gdywkbq-pixman-0.46.4/include/pixman-1 -isystem/gnu/store/x9g3g0b323k2a2j2jypszjq2dnpcjpfg-vulkan-headers-1.4.357.0/include -isystem/gnu/store/kfilm9vmnckfnkjikwrkzffp7bgdinvm-graphene-1.10.8/include/graphene-1.0 -isystem/gnu/store/kfilm9vmnckfnkjikwrkzffp7bgdinvm-graphene-1.10.8/lib/graphene-1.0/include -isystem/gnu/store/l9b9afkpdp6l5nv3yn5gf26jvm00ky49-zlib-1.3.1/include -isystem/gnu/store/b3sjgxi5gq28f2rbal4dqynr6fwb5dkl-util-linux-2.42.2-lib/include/libmount -isystem/gnu/store/b3sjgxi5gq28f2rbal4dqynr6fwb5dkl-util-linux-2.42.2-lib/include/blkid -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include -isystem/gnu/store/nwvwx81dd7zq3n75lyrvbfplrqxqrgh7-libffi-3.4.6/include -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include/glib-2.0 -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/lib/glib-2.0/include -isystem/gnu/store/jymi81irm7b20kjbxm01957dlgchxcxa-pcre2-10.47/include -isystem/gnu/store/ca6wl9kkdfpkmp9addgbanv1sly1sns1-xorgproto-2024.1/include -MD -MQ whelk.p/src_about.c.o -MF whelk.p/src_about.c.o.d -o whelk.p/src_about.c.o -c ../src/about.c
../src/about.c:289:1: fatal error: opening dependency file whelk.p/src_about.c.o.d: No such file or directory
289 | }
| ^
compilation terminated.
[11/397] Compiling C object whelk.p/src_bar.c.o
FAILED: [code=1] whelk.p/src_bar.c.o
cc -Iwhelk.p -I. -I.. -I../src -I/gnu/store/g1wbkj5wd33b4hxjpm0ji9iwikm7ysk7-linux-pam-1.7.2/include -fvisibility=hidden -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -Werror -std=gnu17 -O3 -Wpedantic -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wimplicit-fallthrough -Wvla -Wundef -Wformat=2 -Wformat-security -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=int-conversion -Wno-overlength-strings -Wjump-misses-init -D_GNU_SOURCE '-DWHELK_PAM_LIBDIR="/gnu/store/g1wbkj5wd33b4hxjpm0ji9iwikm7ysk7-linux-pam-1.7.2/lib"' -DHAVE_X11 -DHAVE_XRANDR -DHAVE_PAM '-DWHELK_SCHEME_DIR="/usr/local/share/guile/site/3.0"' '-DDEFAULT_GSK_RENDERER="gl"' '-DPACKAGE_VERSION="0.34.0"' -fPIE -isystem/gnu/store/5g8ismq8wnsnxygpblfn3nn0skl3r68p-libxrandr-1.5.4/include -pthread -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include/gio-unix-2.0 -mfpmath=sse -msse -msse2 -isystem/gnu/store/hak3d9j9ydrwid2pwr5nv99kkwapncs3-gtk4-layer-shell-1.3.0/include/gtk4-layer-shell -isystem/gnu/store/izb9m7xrcjkxzv5kzi930gwdqvfl3j5d-wayland-1.26.0/include -isystem/gnu/store/ddz7grx7w2yg4dwljx5f64mam8vdfvhl-guile-3.0.9/include/guile/3.0 -mfpmath=sse -msse -msse2 -isystem/gnu/store/1ndq0j7wlar8alz03w9fr3kch2a8lgwx-gtk-4.22.1/include/gtk-4.0 -isystem/gnu/store/m6nk9hm4b4xb5cf8cbji4sici37wi9n8-pango-1.57.1/include/pango-1.0 -isystem/gnu/store/74jvgyaddhswxmfxhcdkzm93npr06qws-fribidi-1.0.12/include/fribidi -isystem/gnu/store/3k27039qxq2lvi104ypypykdk8sbw7rx-libthai-0.1.29/include -isystem/gnu/store/mj76wwk62b385fajzhf13jn810y86nvk-libdatrie-0.2.13/include -isystem/gnu/store/8537xiwqf1hlj4qb00lpkpkh2hhwjx3z-libxft-2.3.8/include -isystem/gnu/store/zzvgll4phj3mf95xsq2zy5p90bviqsn7-harfbuzz-11.4.4/include/harfbuzz -isystem/gnu/store/rhbr5bdh0wjgsk1d70cimvffjyf0v13r-graphite2-1.3.13/include -isystem/gnu/store/52i28293snqwxh4ssfk0mawvd9jf5vkm-gdk-pixbuf-2.44.5/include/gdk-pixbuf-2.0 -isystem/gnu/store/vwr84bsi48w6q6w4h8lhz8rc0z87z3xk-libtiff-4.7.2/include -isystem/gnu/store/h8nzyrnxm84h923xygy6iyyvwnxkwijg-xz-5.4.5/include -isystem/gnu/store/zyw34sx7scpj93nwgaa48r0n6jf7bc83-libjpeg-turbo-2.1.4/include -isystem/gnu/store/xjqpcdfgjk6xpgr84ck23kw83pqy2qhf-cairo-1.18.4/include/cairo -isystem/gnu/store/z65wq7k473q19gibaspmli7linllb89h-fontconfig-minimal-2.17.1/include -isystem/gnu/store/24jbvj0wi1sgav4lxbzr923s72xpmzkn-expat-2.8.5/include -isystem/gnu/store/9sbbkyr0y8s0wqhryixqyv5xnjf8vgfb-freetype-2.13.3/include/freetype2 -isystem/gnu/store/wc0hf5j4vh8r8y0xgylh88qgqrcjyh0h-libpng-1.6.59/include/libpng16 -isystem/gnu/store/29fyfw4q4xka9cdxz0lmhjhsq3hyinf6-libxext-1.3.6/include -isystem/gnu/store/y33rgzppgxf813ghvqqhx8rv6jd8ql77-libxrender-0.9.13/include -isystem/gnu/store/rsvvy73r1d6kj9kf1bs10bfhrz3ax4za-libx11-1.8.14/include -isystem/gnu/store/aynknl3n0x2ppmc3f9mafnasg5nhljlg-libxcb-1.17.0/include -isystem/gnu/store/5i3fsjax5si32mi99xrwq8h1ybz0zf5i-libxau-1.0.12/include -isystem/gnu/store/r94nvsl0j55f0cp5lifjhfzjb0xp58h3-libxdmcp-1.1.5/include -isystem/gnu/store/8hl60g8qc8593znwx9418s0f2gdywkbq-pixman-0.46.4/include/pixman-1 -isystem/gnu/store/x9g3g0b323k2a2j2jypszjq2dnpcjpfg-vulkan-headers-1.4.357.0/include -isystem/gnu/store/kfilm9vmnckfnkjikwrkzffp7bgdinvm-graphene-1.10.8/include/graphene-1.0 -isystem/gnu/store/kfilm9vmnckfnkjikwrkzffp7bgdinvm-graphene-1.10.8/lib/graphene-1.0/include -isystem/gnu/store/l9b9afkpdp6l5nv3yn5gf26jvm00ky49-zlib-1.3.1/include -isystem/gnu/store/b3sjgxi5gq28f2rbal4dqynr6fwb5dkl-util-linux-2.42.2-lib/include/libmount -isystem/gnu/store/b3sjgxi5gq28f2rbal4dqynr6fwb5dkl-util-linux-2.42.2-lib/include/blkid -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include -isystem/gnu/store/nwvwx81dd7zq3n75lyrvbfplrqxqrgh7-libffi-3.4.6/include -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/include/glib-2.0 -isystem/gnu/store/prn8yda8b7nyins50y1p9d3yvmm8li2h-glib-2.86.5/lib/glib-2.0/include -isystem/gnu/store/jymi81irm7b20kjbxm01957dlgchxcxa-pcre2-10.47/include -isystem/gnu/store/ca6wl9kkdfpkmp9addgbanv1sly1sns1-xorgproto-2024.1/include -MD -MQ whelk.p/src_bar.c.o -MF whelk.p/src_bar.c.o.d -o whelk.p/src_bar.c.o -c ../src/bar.c
../src/bar.c:535:1: fatal error: opening dependency file whelk.p/src_bar.c.o.d: No such file or directory
535 | }
| ^
compilation terminated.
ninja: build stopped: subcommand failed.
maak: error: command failed (exit code 1): guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; rm -rf build; meson setup build; ninja -C build; meson test -C build --print-errorlogs'
hint: Fix the command above, or run `maak --dry-run' to inspect it first.
--------------------------------------------------------------
Maak 0.14.0: the infinitely extensible command runner
Loading tasks from Maak file: /etc/byggsteg/job-clone/whelk/trunk/maak.scm
Executing Maak tasks: test
--------------------------------------------------------------
=> Running Maak task: test
Build and run the whole test suite inside the Guix environment.
The shell wrapper only applies to the first command, so the pipeline is run by
one inner `sh -c' instead of a bare `&&': otherwise `ninja' would execute
outside the Guix environment.
The build directory is thrown away first: a tree configured by a different
Meson version makes both `meson setup' and `ninja' fail with 'build data file
... references functions or classes that don't exist'. Rebuilding from scratch
also means the passing tests are the ones that match the checked out sources.
Execute command:
guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; rm -rf build; meson setup build; ninja -C build; meson test -C build --print-errorlogs'
Executing: guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; rm -rf build; meson setup build; ninja -C build; meson test -C build --print-errorlogs'