Skip to content

Fix LegacyKeyValueFormat report from docker build: x86_64-gnu #153372

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

Open
homersimpsons wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −50
Open

Fix LegacyKeyValueFormat report from docker build: x86_64-gnu #153372

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/x86_64-gnu-aux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ RUN sh /scripts/sccache.sh
ENV NO_DEBUG_ASSERTIONS=1
ENV NO_OVERFLOW_CHECKS=1

ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
ENV RUST_CHECK_TARGET check-aux
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu"
ENV RUST_CHECK_TARGET="check-aux"
14 changes: 6 additions & 8 deletions src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +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 \
--build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--enable-debug \
--enable-lld \
--set rust.debuginfo-level-tests=2 \
--set llvm.use-linker=lld \
--set target.x86_64-unknown-linux-gnu.linker=clang \
--set target.x86_64-unknown-linux-gnu.cc=clang \
--set target.x86_64-unknown-linux-gnu.cxx=clang++
--set target.x86_64-unknown-linux-gnu.cxx=clang++"

# This job checks:
# - That ui tests can be built with `-Cdebuginfo=1`
Expand All @@ -53,7 +52,6 @@ ENV RUST_CONFIGURE_ARGS \
# - That the tests with `//@ needs-force-clang-based-tests` pass, since they
# don't run by default unless RUSTBUILD_FORCE_CLANG_BASED_TESTS is set.

ENV SCRIPT \
python3 ../x.py --stage 2 build && \
ENV SCRIPT="python3 ../x.py --stage 2 build && \
python3 ../x.py --stage 2 test tests/ui && \
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"
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Runs `distcheck`, which is a collection of smoke tests:
#
#
# - Run `make check` from an unpacked dist tarball to make sure we can at the
# minimum run check steps from those sources.
# - Check that selected dist components at least have expected directory shape
Expand Down Expand Up @@ -34,6 +34,6 @@ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

# Make distcheck builds faster
ENV DISTCHECK_CONFIGURE_ARGS "--enable-sccache"
ENV DISTCHECK_CONFIGURE_ARGS="--enable-sccache"

ENV SCRIPT python3 ../x.py test distcheck
ENV SCRIPT="python3 ../x.py test distcheck"
11 changes: 5 additions & 6 deletions src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV NO_DEBUG_ASSERTIONS 1
ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
ENV NO_DEBUG_ASSERTIONS="1"
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--enable-sanitizers \
--enable-profiler \
--enable-compiler-docs \
--set llvm.libzstd=true \
--set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'
ENV SCRIPT python3 ../x.py \
--set rust.codegen-backends=[\\\"llvm\\\",\\\"gcc\\\"]"
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.

Explained in #152305 (comment)

ENV SCRIPT="python3 ../x.py \
--stage 2 \
test tests \
--test-codegen-backend gcc \
Expand All @@ -51,4 +50,4 @@ ENV SCRIPT python3 ../x.py \
--skip tests/rustdoc-js-std \
--skip tests/rustdoc-json \
--skip tests/rustdoc-ui \
--set 'rust.codegen-backends=[\"llvm\",\"gcc\"]'
--set rust.codegen-backends=[\\\"llvm\\\",\\\"gcc\\\"]"
11 changes: 5 additions & 6 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@ 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 \
--build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-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/

Expand All @@ -63,4 +62,4 @@ COPY scripts/x86_64-gnu-llvm3.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"
11 changes: 5 additions & 6 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-21/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@ 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 \
--build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--llvm-root=/usr/lib/llvm-21 \
--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/

Expand All @@ -63,4 +62,4 @@ COPY scripts/x86_64-gnu-llvm3.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"
9 changes: 4 additions & 5 deletions src/ci/docker/host-x86_64/x86_64-gnu-miri/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@ ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"

COPY host-x86_64/x86_64-gnu-miri/check-miri.sh /tmp/

ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
--enable-new-symbol-mangling
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--enable-new-symbol-mangling"

ENV HOST_TARGET x86_64-unknown-linux-gnu
ENV HOST_TARGET="x86_64-unknown-linux-gnu"

# FIXME(#133381): currently rustc alt builds do *not* have rustc debug
# assertions enabled! Therefore, we cannot force download CI rustc.
#ENV FORCE_CI_RUSTC 1

COPY scripts/shared.sh /scripts/

ENV SCRIPT /tmp/check-miri.sh ../x.py
ENV SCRIPT="/tmp/check-miri.sh ../x.py"
8 changes: 4 additions & 4 deletions src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ 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 --build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--disable-optimize-tests \
--set rust.test-compare-mode
ENV SCRIPT python3 ../x.py test --stage 1 --set rust.optimize=false library/std \
&& python3 ../x.py --stage 2 test
--set rust.test-compare-mode"
ENV SCRIPT="python3 ../x.py test --stage 1 --set rust.optimize=false library/std \
&& python3 ../x.py --stage 2 test"
11 changes: 5 additions & 6 deletions src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,17 @@ COPY scripts/nodejs.sh /scripts/
RUN sh /scripts/nodejs.sh /node
ENV PATH="/node/bin:${PATH}"

ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--save-toolstates=/tmp/toolstate/toolstates.json \
--enable-new-symbol-mangling
--enable-new-symbol-mangling"

ENV HOST_TARGET x86_64-unknown-linux-gnu
ENV HOST_TARGET="x86_64-unknown-linux-gnu"

# FIXME(#133381): currently rustc alt builds do *not* have rustc debug
# assertions enabled! Therefore, we cannot force download CI rustc.
#ENV FORCE_CI_RUSTC 1

COPY scripts/shared.sh /scripts/

ENV SCRIPT /tmp/checktools.sh ../x.py && \
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"
ENV SCRIPT="/tmp/checktools.sh ../x.py && \
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args '--jobs 1'"
7 changes: 3 additions & 4 deletions src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ 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 \
--build=x86_64-unknown-linux-gnu \
ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
--enable-sanitizers \
--enable-profiler \
--enable-compiler-docs \
--set llvm.libzstd=true
ENV SCRIPT python3 ../x.py --stage 2 test
--set llvm.libzstd=true"
ENV SCRIPT="python3 ../x.py --stage 2 test"
Loading