Skip to content

Commit a8d1264

Browse files
committed
don't test stage1 clippy in ci
1 parent 1a0289e commit a8d1264

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

+6
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,14 @@ COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
3939
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
4040

4141
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
42+
43+
# Run clippy just to make sure it doesn't error out; we don't actually want to gate on the warnings
44+
# though.
45+
# Ideally we'd use stage 1, but that ICEs: https://github.com/rust-lang/rust-clippy/issues/11230
46+
4247
ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
4348
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
49+
python3 ../x.py clippy --stage 0 -Awarnings && \
4450
python3 ../x.py build --stage 0 src/tools/build-manifest && \
4551
python3 ../x.py test --stage 0 src/tools/compiletest && \
4652
python3 ../x.py test --stage 0 core alloc std test proc_macro && \

src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh

-5
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,3 @@ fi
4747
# This is intended to make sure that both `--pass=check` continues to
4848
# work.
4949
../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu
50-
51-
# Run clippy just to make sure it doesn't error out; we don't actually want to gate on the warnings
52-
# though.
53-
../x.py --stage 0 clippy -Awarnings
54-
../x.py --stage 1 clippy -Awarnings

0 commit comments

Comments
 (0)