diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
| commit | 86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7 (patch) | |
| tree | c3752892cdc43bf31324ebea11371fa503981bd4 /src/ci/docker | |
| parent | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (diff) | |
| parent | 8321b3fbe44b1edc9b6d012daeaf46ae2b6bc3c8 (diff) | |
| download | rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.tar.gz rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.zip | |
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/i686-gnu/Dockerfile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile b/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile index c15b437e6d3..436215839f7 100644 --- a/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile +++ b/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + zlib1g-dev \ + lib32z1-dev \ xz-utils diff --git a/src/ci/docker/host-x86_64/i686-gnu/Dockerfile b/src/ci/docker/host-x86_64/i686-gnu/Dockerfile index 377f07cef4e..34a76f39668 100644 --- a/src/ci/docker/host-x86_64/i686-gnu/Dockerfile +++ b/src/ci/docker/host-x86_64/i686-gnu/Dockerfile @@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ + zlib1g-dev \ + lib32z1-dev \ xz-utils |