Skip to content

Fix LegacyKeyValueFormat report from docker build: arm #153371

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 7, 2026
+17 −20
Merged

Fix LegacyKeyValueFormat report from docker build: arm #153371

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
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/arm-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/dist-arm-linux-gnueabi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \

ENV HOSTS=arm-unknown-linux-gnueabi

ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
ENV RUST_CONFIGURE_ARGS="--enable-full-tools \
--disable-docs \
--enable-sanitizers \
--enable-profiler
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
--enable-profiler"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=aarch64-unknown-linux-musl

ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
ENV RUST_CONFIGURE_ARGS="--enable-full-tools \
--disable-docs \
--musl-root-aarch64=/usr/local/aarch64-linux-musl \
--enable-sanitizers \
--enable-profiler \
--set target.aarch64-unknown-linux-musl.crt-static=false
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
--set target.aarch64-unknown-linux-musl.crt-static=false"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \

ENV HOSTS=arm-unknown-linux-gnueabihf

ENV RUST_CONFIGURE_ARGS --enable-full-tools --enable-profiler --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-full-tools --enable-profiler --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \

ENV HOSTS=armv7-unknown-linux-gnueabihf

ENV RUST_CONFIGURE_ARGS --enable-full-tools --enable-profiler --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-full-tools --enable-profiler --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/dist-ohos-armv7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ ENV \
AR_armv7_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
CXX_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang++.sh

ENV RUST_CONFIGURE_ARGS \
--enable-profiler \
ENV RUST_CONFIGURE_ARGS="--enable-profiler \
--disable-docs \
--tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
--enable-extended \
--enable-sanitizers
--enable-sanitizers"

ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
ENV SCRIPT="python3 ../x.py dist --host=$TARGETS --target $TARGETS"

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
Loading