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 5e114e1 to 254fcd0
setupuname -a✓ succeeded1 lines · 0.0s
Linux wolk-jjba 7.2.11-gnu #1 SMP PREEMPT_DYNAMIC 1 x86_64 GNU/Linux
commit 254fcd04b61988212a9ae506be01216aaaafde90
Author: Josep Bigorra <jjbigorra@gmail.com>
Date: Mon Nov 16 18:11:27 2026 +0100
fix: the vendored fixtures are in the archive, so guix can checksum them
`guix build` failed in the check phase with
failed to calculate checksum of: rust/vendor/system-deps/src/tests/test.tar.gz
A global `*.tar.gz` in `.gitignore` also matched two archives inside the vendored
`system-deps`, and Guix's source selection takes tracked files only -- so the tree
it built had a vendor directory cargo could not checksum against. Both fixtures
are committed now, and `!rust/vendor/**` keeps a future `cargo vendor` refresh
from dropping them again.
The workspace has one lock file, at its root: `rust/Cargo.lock` was left behind by
the move to a workspace, and its presence made `cargo test --locked` refuse to run
at all ("cannot update the lock file ... because --locked was passed"). It is
deleted, the root lock is committed, and `--locked` builds are green again.
The last meson and shell leftovers go with them: `po/meson.build` and
`tests/run_scheme_tests.sh`, superseded by `cargo xtask i18n` and
`rust/tests/scheme.rs`. The docs, the Guix manifest and the HACKING tree say what
actually runs now.
Suite: cargo test green (312 Rust tests and the Scheme suite), clippy clean.
M .gitignore
M Cargo.lock
M HACKING.org
M NEWS.org
M docs/development.org
M manifest.scm
D po/meson.build
D rust/Cargo.lock
M rust/Cargo.toml
A rust/vendor/system-deps/src/tests/test.tar.gz
A rust/vendor/system-deps/src/tests/test.tar.xz
D tests/run_scheme_tests.sh
testmaak test✗ failed24 lines · 7.0s
Removed 0 files
make: *** No rule to make target 'check'. Stop.
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'