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 b57bcae to 0ca4ee1
setupuname -a✓ succeeded1 lines · 0.0s
Linux wolk-jjba 7.2.11-gnu #1 SMP PREEMPT_DYNAMIC 1 x86_64 GNU/Linux
commit 0ca4ee10a7a62ef7733f554a5f72bbfaccb30ee9
Author: Josep Bigorra <jjbigorra@gmail.com>
Date: Mon Nov 16 19:18:46 2026 +0100
fix: the installer finds the binary a workspace builds
The Guix install phase failed with
could not install .../rust/target/release/lambdock: No such file or directory
right after cargo reported the release build finished -- and it had finished, in
the workspace's `target/`, not in `rust/target/`. Before the tree became a
workspace that path was right, and locally it still looked right because an old
binary was sitting there; a clean sandbox exposed it.
`release_binary()` now asks `CARGO_TARGET_DIR` when it is set and falls back to
the workspace root, so the installer copies what cargo actually produced.
Verified the way a sandbox sees it: with `CARGO_TARGET_DIR=/tmp/td2` and an empty
install prefix, `cargo xtask install --prefix /tmp/p4` builds the release binary
there and lands it in `/tmp/p4/bin/lambdock`; `--destdir` staging still works too.
Also: build.rs no longer declares `AR`. The archive step went when the generated
objects started being linked directly, so the variable had no caller and warned
in every build -- which is what the Guix log was pointing at.
Suite: cargo test green (312 Rust tests and the Scheme suite), no build warnings,
lock refreshed for the bump.
M Cargo.lock
M NEWS.org
M rust/Cargo.toml
M rust/build.rs
M xtask/src/main.rs
testmaak test✗ failed24 lines · 0.3s
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'