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 46a2806 to 5e114e1
setupuname -a✓ succeeded1 lines · 0.0s
Linux wolk-jjba 7.2.11-gnu #1 SMP PREEMPT_DYNAMIC 1 x86_64 GNU/Linux
commit 5e114e1a34d6eb695bf8ccef30f4e4f079582d37
Author: Josep Bigorra <jjbigorra@gmail.com>
Date: Mon Nov 16 17:58:00 2026 +0100
build: delete the Makefile, and let every recipe call cargo
The shim is gone. `cargo build --release`, `cargo test`, `cargo clippy
--all-targets` and `cargo run -p xtask -- install --prefix DIR [--destdir DIR]`
are the whole build, run from the workspace root (which is where
`.cargo/config.toml` points cargo at the vendored crates).
Every recipe follows: Debian's rules override the three dh phases with those
commands, Arch's PKGBUILD and openSUSE's spec do the same in their own idiom, and
the Flatpak manifest runs the build and the install as two commands. Guix and Nix
were already there.
Verified on a staged install: twenty files land where the recipes look for them
(binary, desktop entry, metainfo, logo, nine Scheme modules, seven catalogues),
and the installed binary boots from that root and builds the dock's 25 items.
Suite: cargo test green (312 Rust tests and the Scheme suite), clippy clean.
M Cargo.lock
M Dockerfile
M HACKING.org
D Makefile
M NEWS.org
M packaging/arch/PKGBUILD
M packaging/debian/rules
M packaging/flatpak/org.jointhefreeworld.lambdock.yaml
M packaging/opensuse/lambdock.spec
M rust/Cargo.toml
testmaak test✗ failed24 lines · 0.3s
Removed 5 files, 1.4KiB total
make: *** No rule to make target 'check'. Stop.
--------------------------------------------------------------
Maak 0.14.0: the infinitely extensible command runner
Loading tasks from Maak file: /etc/byggsteg/job-clone/lambdock/trunk/maak.scm
Executing Maak tasks: test
--------------------------------------------------------------
=> Running Maak task: test
Build and run the whole test suite headlessly.
The shell wrapper only applies to the first command, so the pipeline is run by
one inner `sh -c' instead of a bare `&&': otherwise `cargo' would execute
outside the Guix environment.
The suite needs no display: every test is a decision, so it runs where the
manifest shell does, with `make check' -- which is the suite, the lints and the
Scheme tests in one target.
The cargo target directory is thrown away first: the Byggsteg job clone survives
between jobs, and a tree built by a different toolchain can leave artifacts that
no longer match the checked out sources. Rebuilding from scratch also means the
passing tests are the ones that match this commit.
Execute command:
guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; cargo clean --manifest-path rust/Cargo.toml; make check'
Executing: guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; cargo clean --manifest-path rust/Cargo.toml; make check'
maak: error: command failed (exit code 2): guix time-machine --channels=channels.scm -- shell -m manifest.scm -- /bin/sh -c 'set -eu; cargo clean --manifest-path rust/Cargo.toml; make check'
hint: Fix the command above, or run `maak --dry-run' to inspect it first.