Skip to content

Rollup of 7 pull requests #91656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Dec 8, 2021
Merged

Rollup of 7 pull requests #91656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
951dad6
Update certificates in some Ubuntu 16 images.
ehuss Nov 3, 2021
b38a540
Print a suggestion when comparing references to primitive types in co…
FabianWolff Nov 26, 2021
49aa5ba
Emphasise that an OsStr[ing] is not necessarily a platform string
ChrisDenton Dec 2, 2021
74437e4
Do not add `;` to expected tokens list when it's wrong
notriddle Dec 4, 2021
6afbfca
Remove unnecessary FIXME (answered by Oli)
ecstatic-morse Dec 5, 2021
f04b8f2
Make treatment of generator drop shims explicit
ecstatic-morse Dec 6, 2021
6199592
Add better comments for FnParseMode
notriddle Dec 6, 2021
6611567
Expect extern fn with no body when parsing
notriddle Dec 6, 2021
9b6c510
Future compatibility warning on cfg_attr on crate_type and crate_name
bjorn3 Apr 1, 2021
a124924
Remove `in_band_lifetimes` from `rustc_mir_transform`
scottmcm Dec 6, 2021
da158c0
Rollup merge of #83744 - bjorn3:deprecate_cfg_attr_crate_type_name, r…
matthiaskrgr Dec 8, 2021
c104236
Rollup merge of #90550 - ehuss:update-ca, r=Mark-Simulacrum
matthiaskrgr Dec 8, 2021
871cf2b
Rollup merge of #91272 - FabianWolff:issue-90870-const-fn-eq, r=wesle…
matthiaskrgr Dec 8, 2021
bb8a4ab
Rollup merge of #91467 - ChrisDenton:confusing-os-string, r=Mark-Simu…
matthiaskrgr Dec 8, 2021
87f2c51
Rollup merge of #91531 - notriddle:notriddle/issue-87647-expected-sem…
matthiaskrgr Dec 8, 2021
4a76541
Rollup merge of #91577 - ecstatic-morse:mir-pass-manager-cleanup, r=o…
matthiaskrgr Dec 8, 2021
90690da
Rollup merge of #91638 - scottmcm:less-inband-2-of-28, r=petrochenkov
matthiaskrgr Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update certificates in some Ubuntu 16 images.
  • Loading branch information
@ehuss
ehuss committed Nov 3, 2021
commit 951dad63286048ec0cf99e378ebba804534f770c
13 changes: 13 additions & 0 deletions src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 13 additions & 0 deletions src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 13 additions & 0 deletions src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 13 additions & 0 deletions src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down