🚨 Fix LegacyKeyValueFormat report from docker build

Author: homersimpsons

src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile

@@ -29,19 +29,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS 1
+ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS="1"
 
 # llvm.use-linker conflicts with downloading CI LLVM
-ENV NO_DOWNLOAD_CI_LLVM 1
+ENV NO_DOWNLOAD_CI_LLVM="1"
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --build=aarch64-unknown-linux-gnu \
       --enable-debug \
       --enable-lld \
       --set llvm.use-linker=lld \
       --set target.aarch64-unknown-linux-gnu.linker=clang \
       --set target.aarch64-unknown-linux-gnu.cc=clang \
-      --set target.aarch64-unknown-linux-gnu.cxx=clang++
+      --set target.aarch64-unknown-linux-gnu.cxx=clang++"
 
 # This job appears to be checking two separate things:
 # - That we can build the compiler with `--enable-debug`
@@ -52,6 +52,6 @@ ENV RUST_CONFIGURE_ARGS \
 #     Currently we only run the subset of tests with "clang" in their name.
 #   - See also FIXME(#132034)
 
-ENV SCRIPT \
+ENV SCRIPT=" \
   python3 ../x.py --stage 2 build && \
-  python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo
+  python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo"

src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile

@@ -37,20 +37,20 @@ RUN sh /scripts/sccache.sh
 
 # We are disabling CI LLVM since this builder is intentionally using a host
 # LLVM, rather than the typical src/llvm-project LLVM.
-ENV NO_DOWNLOAD_CI_LLVM 1
-ENV EXTERNAL_LLVM 1
+ENV NO_DOWNLOAD_CI_LLVM="1"
+ENV EXTERNAL_LLVM="1"
 
 # Using llvm-link-shared due to libffi issues -- see #34486
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --build=aarch64-unknown-linux-gnu \
       --llvm-root=/usr/lib/llvm-20 \
       --enable-llvm-link-shared \
       --set rust.randomize-layout=true \
-      --set rust.thin-lto-import-instr-limit=10
+      --set rust.thin-lto-import-instr-limit=10"
 
 COPY scripts/shared.sh /scripts/
 
 COPY scripts/stage_2_test_set1.sh /scripts/
 COPY scripts/stage_2_test_set2.sh /scripts/
 
-ENV SCRIPT "Must specify DOCKER_SCRIPT for this image"
+ENV SCRIPT="Must specify DOCKER_SCRIPT for this image"

src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile

@@ -21,10 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
  --build=aarch64-unknown-linux-gnu \
  --enable-sanitizers \
  --enable-profiler \
- --enable-compiler-docs
-ENV SCRIPT python3 ../x.py --stage 2 test && \
-  python3 ../x.py --stage 2 test src/tools/cargo
+ --enable-compiler-docs"
+ENV SCRIP="python3 ../x.py --stage 2 test && \
+  python3 ../x.py --stage 2 test src/tools/cargo"

src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile

@@ -76,7 +76,7 @@ ENV HOSTS=aarch64-unknown-linux-gnu
 
 ENV CPATH=/usr/include/aarch64-linux-gnu/:$CPATH
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --build=aarch64-unknown-linux-gnu \
       --enable-full-tools \
       --enable-profiler \
@@ -93,12 +93,12 @@ ENV RUST_CONFIGURE_ARGS \
       --set rust.jemalloc \
       --set rust.bootstrap-override-lld=true \
       --set rust.lto=thin \
-      --set rust.codegen-units=1
+      --set rust.codegen-units=1"
 
-ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
+ENV SCRIPT="python3 ../x.py build --set rust.debug=true opt-dist && \
       ./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci --  python3 ../x.py dist \
-      --host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap
+      --host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap"
 
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=clang
-ENV LIBCURL_NO_PKG_CONFIG 1
-ENV DIST_REQUIRE_ALL_TOOLS 1
+ENV LIBCURL_NO_PKG_CONFIG="1"
+ENV DIST_REQUIRE_ALL_TOOLS="1"

src/ci/docker/host-x86_64/arm-android/Dockerfile

@@ -32,9 +32,9 @@ ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 
 ENV TARGETS=arm-linux-androideabi
 
-ENV RUST_CONFIGURE_ARGS --android-ndk=/android/ndk/
+ENV RUST_CONFIGURE_ARGS="--android-ndk=/android/ndk/"
 
-ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
+ENV SCRIPT="python3 ../x.py --stage 2 test --host='' --target $TARGETS"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/armhf-gnu/Dockerfile

@@ -82,7 +82,7 @@ RUN sh /scripts/sccache.sh
 
 COPY static/gitconfig /etc/gitconfig
 
-ENV RUST_CONFIGURE_ARGS --qemu-armhf-rootfs=/tmp/rootfs
-ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf
+ENV RUST_CONFIGURE_ARGS="--qemu-armhf-rootfs=/tmp/rootfs"
+ENV SCRIPT="python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf"
 
 ENV NO_CHANGE_USER=1

src/ci/docker/host-x86_64/disabled/dist-aarch64-android/Dockerfile

@@ -13,13 +13,13 @@ ENV DEP_Z_ROOT=/android/ndk/arm64-21/sysroot/usr/
 
 ENV HOSTS=aarch64-linux-android
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --aarch64-linux-android-ndk=/android/ndk/arm64-21 \
       --disable-rpath \
       --enable-extended \
-      --enable-cargo-openssl-static
+      --enable-cargo-openssl-static"
 
-ENV SCRIPT python3 ../x.py dist --target $HOSTS --host $HOSTS
+ENV SCRIPT="python3 ../x.py dist --target $HOSTS --host $HOSTS"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/disabled/dist-armv7-android/Dockerfile

@@ -19,11 +19,11 @@ ENV DEP_Z_ROOT=/android/ndk/arm-14/sysroot/usr/
 
 ENV HOSTS=armv7-linux-androideabi
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --armv7-linux-androideabi-ndk=/android/ndk/arm \
       --disable-rpath \
       --enable-extended \
-      --enable-cargo-openssl-static
+      --enable-cargo-openssl-static"
 
 # We support api level 14, but api level 21 is required to build llvm. To
 # overcome this problem we use a ndk with api level 21 to build llvm and then
@@ -32,12 +32,12 @@ ENV RUST_CONFIGURE_ARGS \
 # level 14), the default linker behavior is to generate an error, to allow the
 # build to finish we use --warn-unresolved-symbols. Note that the missing
 # symbols does not affect std, only the compiler (llvm) and cargo (openssl).
-ENV SCRIPT \
+ENV SCRIPT=" \
   python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
-  (export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
+  (export RUSTFLAGS=\"-C link-arg=-Wl,--warn-unresolved-symbols\"; \
     rm /android/ndk/arm && \
     ln -s /android/ndk/arm-14 /android/ndk/arm && \
-    python3 ../x.py dist --host $HOSTS --target $HOSTS)
+    python3 ../x.py dist --host $HOSTS --target $HOSTS)"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/disabled/dist-i686-android/Dockerfile

@@ -19,11 +19,11 @@ ENV DEP_Z_ROOT=/android/ndk/x86-14/sysroot/usr/
 
 ENV HOSTS=i686-linux-android
 
-ENV RUST_CONFIGURE_ARGS \
+ENV RUST_CONFIGURE_ARGS=" \
       --i686-linux-android-ndk=/android/ndk/x86 \
       --disable-rpath \
       --enable-extended \
-      --enable-cargo-openssl-static
+      --enable-cargo-openssl-static"
 
 # We support api level 14, but api level 21 is required to build llvm. To
 # overcome this problem we use a ndk with api level 21 to build llvm and then
@@ -32,12 +32,12 @@ ENV RUST_CONFIGURE_ARGS \
 # level 14), the default linker behavior is to generate an error, to allow the
 # build to finish we use --warn-unresolved-symbols. Note that the missing
 # symbols does not affect std, only the compiler (llvm) and cargo (openssl).
-ENV SCRIPT \
+ENV SCRIPT=" \
   python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
-  (export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
+  (export RUSTFLAGS=\"-C link-arg=-Wl,--warn-unresolved-symbols\"; \
     rm /android/ndk/x86 && \
     ln -s /android/ndk/x86-14 /android/ndk/x86 && \
-    python3 ../x.py dist --host $HOSTS --target $HOSTS)
+    python3 ../x.py dist --host $HOSTS --target $HOSTS)"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/disabled/dist-m68k-linux/Dockerfile

@@ -24,5 +24,5 @@ RUN sh /scripts/sccache.sh
 
 ENV HOSTS=m68k-unknown-linux-gnu
 
-ENV RUST_CONFIGURE_ARGS --host=$HOSTS --enable-extended
-ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
+ENV RUST_CONFIGURE_ARGS="--host=$HOSTS --enable-extended"
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"