diff options
| author | bors <bors@rust-lang.org> | 2019-07-06 18:19:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-06 18:19:01 +0000 |
| commit | dfd52ba6ac2262c6b61c59ec86bfd23e4e53d3de (patch) | |
| tree | 9585cb8e0899c0961c72a1678d337825d28d66e7 /src/ci/docker | |
| parent | 254f2014954bd66da206232490824975c0c662f1 (diff) | |
| parent | b5cd962be8961a269aa92513cefca2154b20a506 (diff) | |
Auto merge of #59772 - andrehjr:add-rustc-guide-to-toolstate, r=mark-i-m
Add rustc guide to toolstate Closes #59597
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/test-various/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-debug/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-nopt/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 1 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu/Dockerfile | 2 |
7 files changed, 13 insertions, 0 deletions
diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile index c45b1a9a0f1..cfbf2c6b688 100644 --- a/src/ci/docker/test-various/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + libssl-dev \ + pkg-config \ xz-utils \ wget \ patch diff --git a/src/ci/docker/x86_64-gnu-debug/Dockerfile b/src/ci/docker/x86_64-gnu-debug/Dockerfile index 7a503ea4e98..3ac1d2ac90b 100644 --- a/src/ci/docker/x86_64-gnu-debug/Dockerfile +++ b/src/ci/docker/x86_64-gnu-debug/Dockerfile @@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + libssl-dev \ + pkg-config \ xz-utils \ lld \ clang diff --git a/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile b/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile index a157fee16cf..207f972c3cd 100644 --- a/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile +++ b/src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + libssl-dev \ + pkg-config \ xz-utils COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile index ef97f59cafd..6dbbb220347 100644 --- a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile @@ -13,6 +13,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ llvm-6.0-tools \ libedit-dev \ + libssl-dev \ + pkg-config \ zlib1g-dev \ xz-utils diff --git a/src/ci/docker/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/x86_64-gnu-nopt/Dockerfile index d0b244c9b76..6a5c7f5d9e6 100644 --- a/src/ci/docker/x86_64-gnu-nopt/Dockerfile +++ b/src/ci/docker/x86_64-gnu-nopt/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + libssl-dev \ + pkg-config \ xz-utils COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 978732e3c08..9995d2aac7f 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -88,6 +88,7 @@ status_check() { # these tools are not required for beta to successfully branch check_dispatch $1 nightly miri src/tools/miri check_dispatch $1 nightly embedded-book src/doc/embedded-book + check_dispatch $1 nightly rustc-guide src/doc/rustc-guide } # If this PR is intended to update one of these tools, do not let the build pass diff --git a/src/ci/docker/x86_64-gnu/Dockerfile b/src/ci/docker/x86_64-gnu/Dockerfile index c3519a00778..4ec43647213 100644 --- a/src/ci/docker/x86_64-gnu/Dockerfile +++ b/src/ci/docker/x86_64-gnu/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + libssl-dev \ + pkg-config \ xz-utils COPY scripts/sccache.sh /scripts/ |
