Skip to content

Fix rustup cache #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AloeareV merged 12 commits into from
Apr 28, 2026
Merged

Fix rustup cache #1069

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
99e5ee3
fix: drop zaino-rustup volume and bake toolchain into image
Apr 27, 2026
c224af3
fix: drop zaino-rustup volume and bake toolchain into image
zancas Apr 27, 2026
db73f7f
build: stop unconditionally invalidating workspace on every cargo run
zancas Apr 27, 2026
6615957
build: stop unconditionally invalidating workspace on every cargo run
zancas Apr 27, 2026
7625996
fix(container): parameterize toolchain version via ${RUST_VERSION}
zancas Apr 27, 2026
a57bc99
build: unify rust version under rust-toolchain.toml as single source
zancas Apr 27, 2026
2aaeac7
build: bump rust toolchain to 1.95.0
zancas Apr 27, 2026
0d712c5
build: remove stale [build-dependencies] across the workspace
zancas Apr 27, 2026
f623e1d
container-test bind-mounts $PWD into the container and then overlays the
zancas Apr 27, 2026
087acd6
ci(image): add push input to allow dry-run verification
zancas Apr 28, 2026
8726fc8
Five related changes to make release.yaml safely runnable on a feature
zancas Apr 28, 2026
f2d897b
Merge branch 'dev' into fix_rustup_cache
zancas Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ script.post = ""
[tasks.init-podman-volumes]
description = "Initialize named podman volumes for container builds"
script = '''
for vol in zaino-container-target zaino-cargo-git zaino-cargo-registry zaino-rustup; do
for vol in zaino-container-target zaino-cargo-git zaino-cargo-registry; do
if ! podman volume inspect "$vol" >/dev/null 2>&1; then
podman volume create "$vol"
echo "Created podman volume: $vol"
Expand Down Expand Up @@ -267,7 +267,6 @@ podman run --rm \
-v zaino-container-target:/home/container_user/zaino/target:U \
-v zaino-cargo-git:/usr/local/cargo/git:U \
-v zaino-cargo-registry:/usr/local/cargo/registry:U \
-v zaino-rustup:/usr/local/rustup:U \
-e "TEST_BINARIES_DIR=${TEST_BINARIES_DIR}" \
-e "NEXTEST_EXPERIMENTAL_LIBTEST_JSON=1" \
-e "ZAINOLOG_FORMAT=${ZAINOLOG_FORMAT:-stream}" \
Expand Down Expand Up @@ -384,7 +383,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"-v", "zaino-container-target:/home/container_user/zaino/target:U",
"-v", "zaino-cargo-git:/usr/local/cargo/git:U",
"-v", "zaino-cargo-registry:/usr/local/cargo/registry:U",
"-v", "zaino-rustup:/usr/local/rustup:U",
"-e", "TEST_BINARIES_DIR=/home/container_user/zaino/integration-tests/test_binaries/bins",
"-w", "/home/container_user/zaino",
"-u", "container_user",
Expand Down
11 changes: 8 additions & 3 deletions integration-tests/test_environment/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN groupadd --gid ${GID} ${USER} && \
useradd --uid ${UID} --gid ${GID} --home-dir ${HOME} --create-home ${USER}

# Install rustup (Rust toolchain manager) and set up the Rust toolchain
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN rustup update stable
# Install the toolchain under the same channel name rust-toolchain.toml asks
# for at runtime ("1.92"). The rust:${RUST_VERSION}-trixie base image installs
# its toolchain as "1.92.0-x86_64-unknown-linux-gnu", which does not match
# rust-toolchain.toml's `channel = "1.92"` — without this line rustup would
# re-download the whole toolchain on every container start.
RUN rustup toolchain install 1.92 --profile minimal \
Comment thread
zancas marked this conversation as resolved.
Outdated
--component rustfmt --component clippy && \
rustup default 1.92

# Create artifacts directory
RUN mkdir -p /home/container_user/artifacts
Expand Down
Loading