From b9ee655517d90c3be3101bdb24445d06ad1197b1 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Sat, 7 Mar 2026 10:40:02 +0100 Subject: [PATCH] Fix LegacyKeyValueFormat report from docker build: miscellaneous --- .../host-x86_64/dist-android/Dockerfile | 7 +++--- .../dist-loongarch64-linux/Dockerfile | 7 +++--- .../dist-loongarch64-musl/Dockerfile | 7 +++--- .../host-x86_64/dist-riscv64-linux/Dockerfile | 4 ++-- .../host-x86_64/dist-s390x-linux/Dockerfile | 4 ++-- .../dist-sparcv9-solaris/Dockerfile | 4 ++-- .../host-x86_64/x86_64-fuchsia/Dockerfile | 23 ++++++++----------- .../x86_64-rust-for-linux/Dockerfile | 4 ++-- 8 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-android/Dockerfile b/src/ci/docker/host-x86_64/dist-android/Dockerfile index 7b73326e35900..25565564e8dae 100644 --- a/src/ci/docker/host-x86_64/dist-android/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-android/Dockerfile @@ -16,15 +16,14 @@ ENV TARGETS=$TARGETS,i686-linux-android ENV TARGETS=$TARGETS,aarch64-linux-android ENV TARGETS=$TARGETS,x86_64-linux-android -ENV RUST_CONFIGURE_ARGS \ - --enable-extended \ +ENV RUST_CONFIGURE_ARGS="--enable-extended \ --enable-profiler \ --android-ndk=/android/ndk/ \ - --disable-docs + --disable-docs" ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin -ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS +ENV SCRIPT="python3 ../x.py dist --host= --target $TARGETS" COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile index 96acc5e97e94b..3ee8cb9ed7e8f 100644 --- a/src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile @@ -45,14 +45,13 @@ ENV TARGETS=$HOSTS ENV TARGETS=$TARGETS,loongarch64-unknown-none ENV TARGETS=$TARGETS,loongarch64-unknown-none-softfloat -ENV RUST_CONFIGURE_ARGS \ - --enable-extended \ +ENV RUST_CONFIGURE_ARGS="--enable-extended \ --enable-full-tools \ --enable-profiler \ --enable-sanitizers \ --disable-docs \ --set rust.jemalloc \ --set rust.lto=thin \ - --set rust.codegen-units=1 + --set rust.codegen-units=1" -ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $TARGETS +ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $TARGETS" diff --git a/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile index 44efc10890177..54c1869a2a04f 100644 --- a/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile @@ -27,8 +27,7 @@ ENV CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \ ENV HOSTS=loongarch64-unknown-linux-musl -ENV RUST_CONFIGURE_ARGS \ - --enable-extended \ +ENV RUST_CONFIGURE_ARGS="--enable-extended \ --enable-full-tools \ --enable-profiler \ --enable-sanitizers \ @@ -37,6 +36,6 @@ ENV RUST_CONFIGURE_ARGS \ --set rust.lto=thin \ --set rust.codegen-units=1 \ --set target.loongarch64-unknown-linux-musl.crt-static=false \ - --musl-root-loongarch64=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/usr + --musl-root-loongarch64=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/usr" -ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS +ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS" diff --git a/src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile index 4a66564a90acd..3080220c837e6 100644 --- a/src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile @@ -30,5 +30,5 @@ ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \ ENV HOSTS=riscv64gc-unknown-linux-gnu ENV TARGETS=riscv64gc-unknown-linux-gnu,riscv64a23-unknown-linux-gnu -ENV RUST_CONFIGURE_ARGS --enable-extended --enable-profiler --disable-docs -ENV SCRIPT python3 ../x.py dist --target $TARGETS --host $HOSTS +ENV RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --disable-docs" +ENV SCRIPT="python3 ../x.py dist --target $TARGETS --host $HOSTS" diff --git a/src/ci/docker/host-x86_64/dist-s390x-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-s390x-linux/Dockerfile index de776911d628d..413249e02e87f 100644 --- a/src/ci/docker/host-x86_64/dist-s390x-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-s390x-linux/Dockerfile @@ -26,5 +26,5 @@ ENV \ ENV HOSTS=s390x-unknown-linux-gnu -ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-sanitizers --enable-profiler --disable-docs -ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS +ENV RUST_CONFIGURE_ARGS="--enable-extended --enable-lld --enable-sanitizers --enable-profiler --disable-docs" +ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS" diff --git a/src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile b/src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile index f7852c6364dc2..ffe28fca11656 100644 --- a/src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile @@ -32,5 +32,5 @@ ENV \ ENV HOSTS=sparcv9-sun-solaris -ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs -ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS +ENV RUST_CONFIGURE_ARGS="--enable-extended --disable-docs" +ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS" diff --git a/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile index 0cae83a85b3a4..ccb7841d83ac3 100644 --- a/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile @@ -38,13 +38,12 @@ COPY scripts/shared.sh /tmp/ COPY scripts/build-fuchsia-toolchain.sh /tmp/ RUN /tmp/build-fuchsia-toolchain.sh -ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar -ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \ - -C panic=abort \ +ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR="/usr/local/bin/llvm-ar" +ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS="-C panic=abort \ -C force-unwind-tables=yes \ -C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \ -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \ - -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib + -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib" ENV TARGETS=x86_64-unknown-fuchsia ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu @@ -52,17 +51,16 @@ ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -ENV RUST_INSTALL_DIR /checkout/obj/install +ENV RUST_INSTALL_DIR="/checkout/obj/install" RUN mkdir -p $RUST_INSTALL_DIR/etc # Fuchsia only supports LLVM. -ENV CODEGEN_BACKENDS llvm +ENV CODEGEN_BACKENDS="llvm" # download-rustc is not allowed for `x install` -ENV NO_DOWNLOAD_CI_RUSTC 1 +ENV NO_DOWNLOAD_CI_RUSTC="1" -ENV RUST_CONFIGURE_ARGS \ - --prefix=$RUST_INSTALL_DIR \ +ENV RUST_CONFIGURE_ARGS="--prefix=$RUST_INSTALL_DIR \ --sysconfdir=etc \ --enable-lld \ --llvm-libunwind=in-tree \ @@ -72,8 +70,7 @@ ENV RUST_CONFIGURE_ARGS \ --set target.x86_64-unknown-fuchsia.cxx=/usr/local/bin/clang++ \ --set target.x86_64-unknown-fuchsia.ar=/usr/local/bin/llvm-ar \ --set target.x86_64-unknown-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \ - --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld + --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld" -ENV SCRIPT \ - python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \ - bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh +ENV SCRIPT="python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \ + bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh" diff --git a/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile index 97298519cf20b..28a51ca2d6857 100644 --- a/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile @@ -34,7 +34,7 @@ RUN sh /scripts/sccache.sh # RfL needs access to cland, lld and llvm tools ENV PATH="${PATH}:/usr/lib/llvm-15/bin" -ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu +ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu" COPY /scripts/rfl-build.sh /tmp/rfl-build.sh -ENV SCRIPT bash /tmp/rfl-build.sh +ENV SCRIPT="bash /tmp/rfl-build.sh"