Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #153372 - homersimpsons:chore/fix-LegacyKeyValueFormat-x86_64-gnu, r=marcoieni

Browse Source 
Fix LegacyKeyValueFormat report from docker build: x86_64-gnu

Part of rust-lang/rust#152305

r? @marcoieni
This commit is contained in:
Stuart Cook
2026-03-17 15:53:10 +11:00
committed by GitHub
parent f08ebf3635 d19a07b2a9
commit fec951b823
9 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile
+2 -2
View File
@@ -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"
src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
+6 -8
View File
@@ -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`
@@ -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"
src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
+3 -3
View File
@@ -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
@@ -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"
src/ci/docker/host-x86_64/x86_64-gnu-gcc/Dockerfile
+5 -6
View File
@@ -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\\\"]"
ENV SCRIPT="python3 ../x.py \
--stage 2 \
test tests \
--test-codegen-backend gcc \
@@ -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\\\"]"
src/ci/docker/host-x86_64/x86_64-gnu-llvm-21/Dockerfile
+5 -6
View File
@@ -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/
@@ -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"
src/ci/docker/host-x86_64/x86_64-gnu-miri/Dockerfile
+4 -5
View File
@@ -34,11 +34,10 @@ 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.
@@ -46,4 +45,4 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu
COPY scripts/shared.sh /scripts/
ENV SCRIPT /tmp/check-miri.sh ../x.py
ENV SCRIPT="/tmp/check-miri.sh ../x.py"
src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
+4 -4
View File
@@ -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"
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
+5 -6
View File
@@ -76,12 +76,11 @@ 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.
@@ -89,5 +88,5 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu
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'"
src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
+3 -4
View File
@@ -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"