Skip to content

Commit 91426e9

Browse files
authored
Rollup merge of #69688 - JohnTitor:move-tidy, r=Mark-Simulacrum
Move tidy check to mingw-check Fixes #69613
2 parents 8cf9e9e + d6a17b5 commit 91426e9

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/ci/docker/mingw-check/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
2525
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
2626
python2.7 ../x.py build --stage 0 src/tools/build-manifest && \
2727
python2.7 ../x.py test --stage 0 src/tools/compiletest && \
28+
python2.7 ../x.py test src/tools/tidy && \
2829
/scripts/validate-toolstate.sh

src/ci/docker/x86_64-gnu-llvm-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV RUST_CONFIGURE_ARGS \
2929
--enable-llvm-link-shared \
3030
--set rust.thin-lto-import-instr-limit=10
3131

32-
ENV SCRIPT python2.7 ../x.py test src/tools/tidy && python2.7 ../x.py test
32+
ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/tools/tidy
3333

3434
# The purpose of this container isn't to test with debug assertions and
3535
# this is run on all PRs, so let's get speedier builds by disabling these extra

0 commit comments

Comments
 (0)