diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-17 12:16:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 12:16:12 +0100 |
| commit | 91426e9666fad1c574e7fb6ec806a6cf2f0b2192 (patch) | |
| tree | 8bac0c67cb175279deee455aad1d71a8591f68a6 /src/ci | |
| parent | 8cf9e9efcadef137b9f04c741115aa8664a5a910 (diff) | |
| parent | d6a17b598f0e82535fc38c8455aed9571f44aaa2 (diff) | |
| download | rust-91426e9666fad1c574e7fb6ec806a6cf2f0b2192.tar.gz rust-91426e9666fad1c574e7fb6ec806a6cf2f0b2192.zip | |
Rollup merge of #69688 - JohnTitor:move-tidy, r=Mark-Simulacrum
Move tidy check to mingw-check Fixes #69613
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-7/Dockerfile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index b2d96aed2a9..e973ba2e33c 100644 --- a/src/ci/docker/mingw-check/Dockerfile +++ b/src/ci/docker/mingw-check/Dockerfile @@ -25,4 +25,5 @@ ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \ python2.7 ../x.py build --stage 0 src/tools/build-manifest && \ python2.7 ../x.py test --stage 0 src/tools/compiletest && \ + python2.7 ../x.py test src/tools/tidy && \ /scripts/validate-toolstate.sh diff --git a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile index 4cd9e164558..4b5d5cac516 100644 --- a/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile @@ -29,7 +29,7 @@ ENV RUST_CONFIGURE_ARGS \ --enable-llvm-link-shared \ --set rust.thin-lto-import-instr-limit=10 -ENV SCRIPT python2.7 ../x.py test src/tools/tidy && python2.7 ../x.py test +ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/tools/tidy # The purpose of this container isn't to test with debug assertions and # this is run on all PRs, so let's get speedier builds by disabling these extra |