Skip to content

Commit 98b80fc

Browse files
authored
Rollup merge of #105714 - jyn514:tidy-first, r=Mark-Simulacrum
Run `x test tidy` sooner in mingw-check It takes less time to run than the other tests and is more likely to fail. `expand-yaml-anchors` is still run first to make sure the CI files are internally consistent. Note that changing to `--stage 0` doesn't actually do anything since bootstrap tools are always built with the bootstrap compiler, this just makes it less confusing. cc 83bab41
2 parents e657bbc + fc6d59d commit 98b80fc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/ci/docker/host-x86_64/mingw-check/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
4040

4141
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
4242
ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
43+
python3 ../x.py test --stage 0 src/tools/tidy && \
4344
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu --all-targets && \
4445
python3 ../x.py build --stage 0 src/tools/build-manifest && \
4546
python3 ../x.py test --stage 0 src/tools/compiletest && \
46-
python3 ../x.py test --stage 2 src/tools/tidy && \
4747
python3 ../x.py test --stage 0 core alloc std test proc_macro && \
4848
# Build both public and internal documentation.
4949
RUSTDOCFLAGS="--document-private-items" python3 ../x.py doc --stage 0 library/test && \

src/ci/run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,6 @@ trap datecheck EXIT
157157
# sccache server at the start of the build, but no need to worry if this fails.
158158
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
159159

160-
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
161-
$SRC/configure --set rust.parallel-compiler
162-
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
163-
rm -f config.toml
164-
rm -rf build
165-
fi
166-
167160
$SRC/configure $RUST_CONFIGURE_ARGS
168161

169162
retry make prepare
@@ -193,4 +186,11 @@ else
193186
do_make "$RUST_CHECK_TARGET"
194187
fi
195188

189+
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
190+
rm -f config.toml
191+
rm -rf build
192+
$SRC/configure --set rust.parallel-compiler
193+
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
194+
fi
195+
196196
sccache --show-stats || true

0 commit comments

Comments
 (0)