mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
Auto merge of #93837 - nikic:arm-update, r=Mark-Simulacrum
Update dist-(arm|armv7|armhf)-linux to Ubuntu 20.04 I believe this should be safe, as actual artifacts will be produced by a cross toolchain. The build ran through cleanly locally. This came up in https://github.com/rust-lang/rust/pull/93577, where the host GCC ICEd during the LLD build. (Though I wonder why we build LLD for the host at all...) r? `@Mark-Simulacrum`
This commit is contained in:
commit
1a8fa2af1c
@ -1,17 +1,4 @@
|
||||
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
|
||||
|
@ -1,17 +1,4 @@
|
||||
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
|
||||
|
@ -1,17 +1,4 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user