diff options
| author | bors <bors@rust-lang.org> | 2021-12-08 11:22:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-08 11:22:02 +0000 |
| commit | 4459e720bee5a741b962cfcd6f0593b32dc19009 (patch) | |
| tree | 8f971851dcee5e588231ca5d7af66e223af47b08 /src/ci | |
| parent | ce0f7baf5651606c706b7014b5abdaa930cf2600 (diff) | |
| parent | 90690dae69b5213fb04b88408ad4d18a7130f40c (diff) | |
| download | rust-4459e720bee5a741b962cfcd6f0593b32dc19009.tar.gz rust-4459e720bee5a741b962cfcd6f0593b32dc19009.zip | |
Auto merge of #91656 - matthiaskrgr:rollup-lk96y6d, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #83744 (Deprecate crate_type and crate_name nested inside #![cfg_attr]) - #90550 (Update certificates in some Ubuntu 16 images.) - #91272 (Print a suggestion when comparing references to primitive types in `const fn`) - #91467 (Emphasise that an OsStr[ing] is not necessarily a platform string) - #91531 (Do not add `;` to expected tokens list when it's wrong) - #91577 (Address some FIXMEs left over from #91475) - #91638 (Remove `in_band_lifetimes` from `rustc_mir_transform`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
4 files changed, 52 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile index e6b6b6e53b9..ab588ccc249 100644 --- a/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile @@ -1,5 +1,18 @@ +FROM ubuntu:20.04 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates +WORKDIR /tmp +RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem + FROM ubuntu:16.04 +# The ca-certificates in ubuntu-16 is too old, so update the certificates +# with something more recent. +COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem +ENV CURL_CA_BUNDLE /tmp/cacert.pem + COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile index 61cc000dca5..ee4fd759b46 100644 --- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile @@ -1,5 +1,18 @@ +FROM ubuntu:20.04 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates +WORKDIR /tmp +RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem + FROM ubuntu:16.04 +# The ca-certificates in ubuntu-16 is too old, so update the certificates +# with something more recent. +COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem +ENV CURL_CA_BUNDLE /tmp/cacert.pem + COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh diff --git a/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile index 66eb4137a87..b11a1d3feb2 100644 --- a/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile @@ -1,5 +1,18 @@ +FROM ubuntu:20.04 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates +WORKDIR /tmp +RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem + FROM ubuntu:16.04 +# The ca-certificates in ubuntu-16 is too old, so update the certificates +# with something more recent. +COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem +ENV CURL_CA_BUNDLE /tmp/cacert.pem + COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh diff --git a/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile index c13f63911f8..55ca23b293d 100644 --- a/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile @@ -1,5 +1,18 @@ +FROM ubuntu:20.04 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates +WORKDIR /tmp +RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem + FROM ubuntu:16.04 +# The ca-certificates in ubuntu-16 is too old, so update the certificates +# with something more recent. +COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem +ENV CURL_CA_BUNDLE /tmp/cacert.pem + COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh |