Skip to content

Fix LegacyKeyValueFormat report from docker build: disabled #153224

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
rust-bors merged 1 commit into from
Mar 4, 2026
+33 −40
Merged

Fix LegacyKeyValueFormat report from docker build: disabled #153224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/disabled/dist-aarch64-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ ENV DEP_Z_ROOT=/android/ndk/arm64-21/sysroot/usr/

ENV HOSTS=aarch64-linux-android

ENV RUST_CONFIGURE_ARGS \
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \
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
12 changes: 5 additions & 7 deletions src/ci/docker/host-x86_64/disabled/dist-armv7-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ ENV DEP_Z_ROOT=/android/ndk/arm-14/sysroot/usr/

ENV HOSTS=armv7-linux-androideabi

ENV RUST_CONFIGURE_ARGS \
--armv7-linux-androideabi-ndk=/android/ndk/arm \
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
Expand All @@ -32,12 +31,11 @@ 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 \
python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
ENV SCRIPT="python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(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
12 changes: 5 additions & 7 deletions src/ci/docker/host-x86_64/disabled/dist-i686-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ ENV DEP_Z_ROOT=/android/ndk/x86-14/sysroot/usr/

ENV HOSTS=i686-linux-android

ENV RUST_CONFIGURE_ARGS \
--i686-linux-android-ndk=/android/ndk/x86 \
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
Expand All @@ -32,12 +31,11 @@ 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 \
python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
ENV SCRIPT="python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(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
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-m68k-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-powerpcspe-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=powerpc-unknown-linux-gnuspe

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"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-sparc64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=sparc64-unknown-linux-gnu

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"
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ ENV DEP_Z_ROOT=/android/ndk/x86_64-21/sysroot/usr/

ENV HOSTS=x86_64-linux-android

ENV RUST_CONFIGURE_ARGS \
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
ENV RUST_CONFIGURE_ARGS="--x86_64-linux-android-ndk=/android/ndk/x86_64-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
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ ENV \

ENV HOSTS=x86_64-unknown-dragonfly

ENV RUST_CONFIGURE_ARGS --enable-extended
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-extended"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
8 changes: 4 additions & 4 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ RUN sh /scripts/sccache.sh
ENV HOST=x86_64-unknown-haiku
ENV TARGET=target.$HOST

ENV RUST_CONFIGURE_ARGS --disable-jemalloc \
ENV RUST_CONFIGURE_ARGS="--disable-jemalloc \
--set=$TARGET.cc=x86_64-unknown-haiku-gcc \
--set=$TARGET.cxx=x86_64-unknown-haiku-g++ \
--set=$TARGET.llvm-config=/bin/llvm-config-haiku
ENV EXTERNAL_LLVM 1
--set=$TARGET.llvm-config=/bin/llvm-config-haiku"
ENV EXTERNAL_LLVM="1"

ENV SCRIPT python3 ../x.py dist --host=$HOST --target=$HOST
ENV SCRIPT="python3 ../x.py dist --host=$HOST --target=$HOST"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-redox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ ENV \
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
CXX_x86_64_unknown_redox=x86_64-unknown-redox-g++

ENV RUST_CONFIGURE_ARGS --enable-extended
ENV SCRIPT python3 ../x.py dist --host='' --target x86_64-unknown-redox
ENV RUST_CONFIGURE_ARGS="--enable-extended"
ENV SCRIPT="python3 ../x.py dist --host= --target x86_64-unknown-redox"
Copy link
Member

@marcoieni marcoieni Mar 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why you edited --host='' to --host=?
same in riscv.

Copy link
Contributor Author

@homersimpsons homersimpsons Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I explained it in #153224 (comment)

Note that if I preserve the '' I have a different output:

SCRIPT_SOURCE=python3 ../x.py --stage 2 test --host= --target riscv64gc-unknown-linux-gnu
SCRIPT_TARGET=python3 ../x.py --stage 2 test --host='' --target riscv64gc-unknown-linux-gnu

From my understanding docker is parsing the quotes with the previous syntax while it does not touch them with the new one.

7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/disabled/riscv64gc-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@ RUN sh /scripts/sccache.sh
# Avoid "fatal: detected dubious ownership in repository at '/checkout'" error
RUN git config --global --add safe.directory /checkout

ENV RUST_CONFIGURE_ARGS \
--qemu-riscv64-rootfs=/tmp/rootfs \
--set target.riscv64gc-unknown-linux-gnu.linker=riscv64-linux-gnu-gcc
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target riscv64gc-unknown-linux-gnu
ENV RUST_CONFIGURE_ARGS="--qemu-riscv64-rootfs=/tmp/rootfs \
--set target.riscv64gc-unknown-linux-gnu.linker=riscv64-linux-gnu-gcc"
ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target riscv64gc-unknown-linux-gnu"

ENV NO_CHANGE_USER=1
Loading