Rollup merge of rust-lang#153529 - homersimpsons:chore/fix-LegacyKeyValueFormat-pr, r=marcoieni

Fix LegacyKeyValueFormat report from docker build: pr

Part of rust-lang#152305

r? @marcoieni

Author: JonathanBrouwer

src/ci/docker/host-x86_64/pr-check-1/Dockerfile

@@ -39,7 +39,7 @@ COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 # Check library crates on all tier 1 targets.
 # We disable optimized compiler built-ins because that requires a C toolchain for the target.
 # We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
-ENV SCRIPT \
+ENV SCRIPT=" \
   # Check some tools that aren't included in `x check` by default, to
   # ensure that maintainers can still do check builds locally.
   python3 ../x.py check \
@@ -58,4 +58,4 @@ ENV SCRIPT \
   python3 ../x.py check --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \
   /scripts/validate-toolstate.sh && \
   reuse --include-submodules lint && \
-  python3 ../x.py test collect-license-metadata
+  python3 ../x.py test collect-license-metadata"

src/ci/docker/host-x86_64/pr-check-2/Dockerfile

@@ -30,8 +30,7 @@ ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV SCRIPT \
-        python3 ../x.py check && \
+ENV SCRIPT="python3 ../x.py check && \
         python3 ../x.py clippy ci --stage 2 && \
         python3 ../x.py test --stage 1 core alloc std test proc_macro && \
         # Elsewhere, we run all tests for the host. A number of codegen tests are sensitive to the target pointer
@@ -48,4 +47,4 @@ ENV SCRIPT \
         RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc library/test --stage 1 && \
         # The BOOTSTRAP_TRACING flag is added to verify whether the
         # bootstrap process compiles successfully with this flag enabled.
-        BOOTSTRAP_TRACING=1 python3 ../x.py --help
+        BOOTSTRAP_TRACING=1 python3 ../x.py --help"

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -39,5 +39,5 @@ COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
-ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
-  src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck
+ENV SCRIPT="TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
+  src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck"