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 cc60691 to d728e3c
setupuname -a✓ succeeded1 lines · 0.0s
Linux wolk-jjba 7.2.11-gnu #1 SMP PREEMPT_DYNAMIC 1 x86_64 GNU/Linux
commit d728e3cd98e8e5a4b1f427cdff15be143de926f2
Author: Josep Bigorra <jjbigorra@gmail.com>
Date: Mon Nov 16 17:41:06 2026 +0100
build: a cargo workspace and an xtask, and the Scheme suite as a test
The tree is one workspace now: the dock in `rust/`, and `xtask/` -- a
dependency-free crate for the three jobs cargo has no target for. `cargo xtask
install --prefix` copies the binary, the desktop entry, the AppStream metainfo,
the logo, the Scheme modules and the compiled catalogues into place; `cargo xtask
i18n` compiles every `po/*.po` with msgfmt; `cargo xtask dist` writes the source
archive. Every argument is used as an argument, and a step that fails stops the
task instead of leaving half an install behind.
`make` survives as a five-line shim over those commands, so the recipes that type
it keep working, and the two that should express the real build now do: Guix
replaces its build and install phases with cargo and the xtask, and Nix does the
same. The Makefile's `check` is `cargo test` plus clippy.
The Scheme suite moved into cargo: `tests/run_scheme_tests.sh` is gone and
`rust/tests/scheme.rs` runs the same 342 assertions, finding an interpreter or
skipping, as the script did by exiting 77. `cargo test` is the whole suite now.
One thing the workspace taught immediately: `rustc-link-arg` from a build script
is handed to every binary in the build unit, so `xtask` was asked to resolve
GLib's resource symbols it never uses. It is `rustc-link-arg-bins` now -- the
generated objects belong to this package's binary and no other.
Suite: cargo test 312 Rust tests plus the Scheme suite, clippy clean, and the
release binary still builds the dock's 25 items with no criticals.
A Cargo.lock
A Cargo.toml
M Dockerfile
M Makefile
M NEWS.org
M guix.scm
M package.nix
M packaging/arch/PKGBUILD
M rust/Cargo.toml
M rust/build.rs
A rust/tests/scheme.rs
A xtask/Cargo.toml
A xtask/src/main.rs
testmaak test✗ failed30 lines · 0.5s
Removed 0 files
cargo test --offline --locked
error: failed to calculate checksum of: /etc/byggsteg/job-clone/lambdock/trunk/rust/vendor/system-deps/src/tests/test.tar.gz
Caused by:
failed to open file `/etc/byggsteg/job-clone/lambdock/trunk/rust/vendor/system-deps/src/tests/test.tar.gz`
Caused by:
No such file or directory (os error 2)
make: *** [Makefile:28: test] Error 101
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.
--------------------------------------------------------------
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'