Skip to content

Commit bf9944f

Browse files
committed
Auto merge of rust-lang#159992 - Kobzol:no-test-in-i586, r=jieyouxu
Do not run tests in `dist` jobs We found out in rust-lang#159455 that some dist jobs run tests, but this seems as a historical artifact (going way back to <2020). These targets are tier 2 or tier 3 anyway, and shouldn't run tests, much less so in `dist` jobs. r? @jieyouxu
2 parents d3ea035 + a90b6ec commit bf9944f

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,4 @@ ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no
7575

7676
ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
7777

78-
ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target $TARGETS && \
79-
python3 ../x.py dist --host= --target $TARGETS,i586-unknown-linux-musl"
78+
ENV SCRIPT="python3 ../x.py dist --host= --target $TARGETS,i586-unknown-linux-musl"

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ ENV RUST_CONFIGURE_ARGS="--musl-root-armv5te=/musl-armv5te \
175175
--musl-root-armv7hf=/musl-armv7hf \
176176
--disable-docs"
177177

178-
ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target $RUN_MAKE_TARGETS tests/run-make tests/run-make-cargo && \
179-
python3 ../x.py dist --host= --target $TARGETS"
178+
ENV SCRIPT="python3 ../x.py dist --host= --target $TARGETS"
180179

181180
# sccache
182181
COPY scripts/sccache.sh /scripts/

0 commit comments

Comments
 (0)