From 8d37bbd68f9a78152ae8f432b846bcef2a809661 Mon Sep 17 00:00:00 2001 From: John McBride Date: Fri, 21 Aug 2026 12:10:58 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(ci):=20bump=20cargo-zigbuild?= =?UTF-8?q?=20to=200.23.0=20and=20rust=20image=20to=201.88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cargo-zigbuild 0.23.0 skips rustc's -Wl,--fix-cortex-a53-843419 for the aarch64 musl target (rust-lang/rust#155453), which zig 0.13.0's linker rejects; it also needs rustc 1.88+, hence the image bump from 1.85 to 1.88. --- .dagger/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.dagger/main.go b/.dagger/main.go index d48521d..82d2765 100644 --- a/.dagger/main.go +++ b/.dagger/main.go @@ -24,10 +24,12 @@ import ( ) // Pinned cross-compile toolchain. Bumped intentionally. +// +// cargo-zigbuild 0.23.0 needs rustc 1.88+, so rustImage can't stay at 1.85. const ( - rustImage = "rust:1.85-bookworm" + rustImage = "rust:1.88-bookworm" zigVersion = "0.13.0" - cargoZigbuildVersion = "0.19.8" + cargoZigbuildVersion = "0.23.0" ) // Tapesctl is the main module for the tapesctl CI/CD pipeline. @@ -101,7 +103,7 @@ rm /tmp/zig.tar.xz` WithMountedCache("/src/target", cargoTarget). // Materialize the toolchain declared in rust-toolchain.toml (channel = // stable) BEFORE adding targets — otherwise `rustup target add` targets - // the image's default 1.85 toolchain while cargo builds under stable, + // the image's default 1.88 toolchain while cargo builds under stable, // and the cross-target std is missing ("can't find crate for std"). WithExec([]string{"rustup", "show"}). WithExec([]string{"rustup", "target", "add",