diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-28 23:19:54 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-12-03 18:36:56 +0800 |
| commit | 128199e39c2644e3e0c0580869a561f9211e6d98 (patch) | |
| tree | c9aeaa38d5267494119747dfee5cf46634b5ff93 /src/ci/docker | |
| parent | 0bae745cd84879bf97cf81d9eca28fbfa2360722 (diff) | |
| download | rust-128199e39c2644e3e0c0580869a561f9211e6d98.tar.gz rust-128199e39c2644e3e0c0580869a561f9211e6d98.zip | |
Move the swap the tools test and cargotest within check-aux.
The cargotest job is renamed to tools for clarification.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/x86_64-gnu-aux/Dockerfile | 6 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-tools/Dockerfile (renamed from src/ci/docker/x86_64-gnu-cargotest/Dockerfile) | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ci/docker/x86_64-gnu-aux/Dockerfile b/src/ci/docker/x86_64-gnu-aux/Dockerfile index a453c62cc9e..62c55f48067 100644 --- a/src/ci/docker/x86_64-gnu-aux/Dockerfile +++ b/src/ci/docker/x86_64-gnu-aux/Dockerfile @@ -12,7 +12,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ sudo \ xz-utils \ - pkg-config + pkg-config \ + libgl1-mesa-dev \ + llvm-dev \ + libfreetype6-dev \ + libexpat1-dev COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/x86_64-gnu-cargotest/Dockerfile b/src/ci/docker/x86_64-gnu-tools/Dockerfile index a5326625bf4..f4ba58e536f 100644 --- a/src/ci/docker/x86_64-gnu-cargotest/Dockerfile +++ b/src/ci/docker/x86_64-gnu-tools/Dockerfile @@ -12,14 +12,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ sudo \ xz-utils \ - pkg-config \ - libgl1-mesa-dev \ - llvm-dev \ - libfreetype6-dev \ - libexpat1-dev + pkg-config COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu -ENV SCRIPT python2.7 ../x.py test src/tools/cargotest +ENV SCRIPT python2.7 ../x.py --no-fail-fast \ + src/tools/rls \ + src/tools/rustfmt \ + src/tools/miri \ + src/tools/clippy |