Skip to content
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.

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

CI: Use ubuntu image to download openssl, curl sources, cacert.pem for x86 dist builds #90457

Merged
merged 2 commits into from
Nov 2, 2021

Conversation

hkratz
Copy link
Contributor

@hkratz hkratz commented Oct 31, 2021

The dist-x86_64 and dist-i686 docker builds are failing again (see try build) because python.org renewed its certificate with a CA cert that is too new for debian:6.

In order to solve this once and for all this PR moves the curl and openssl downloads to a new ubuntu:20.04 "stage-0" docker build and copies the downloaded tarballs over to build them in the "stage-1" debian:6 context. It also downloads the cacert.pem file from the curl website and uses it by pointing the CURL_CA_BUNDLE environment variable to it.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 31, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy (will rebuild the docker image which may need a timeout)

It looks like we have a bunch of ubuntu 16.04 dockers as well, which might need a similar patch soon as well, since those are no longer receiving updates as of April this year I believe.

@bors
Copy link
Contributor

bors commented Oct 31, 2021

📌 Commit 222a7991a63b39cd6fbb63db77d32004779b0141 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 31, 2021
@rust-log-analyzer

This comment has been minimized.

@hkratz hkratz force-pushed the use-curl-ca-bundle branch from 222a799 to 3a687e7 Compare October 31, 2021 22:30
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Oct 31, 2021

📌 Commit 3a687e7 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Nov 1, 2021

⌛ Testing commit 3a687e7 with merge 015697e7b441c65b33b734f9cba34f3ddc7a4c5a...

@bors
Copy link
Contributor

bors commented Nov 1, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 1, 2021
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@hkratz hkratz force-pushed the use-curl-ca-bundle branch from cc4fb63 to aef51a0 Compare November 1, 2021 18:20
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Nov 1, 2021

📌 Commit aef51a0 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 1, 2021
@bors
Copy link
Contributor

bors commented Nov 1, 2021

⌛ Testing commit aef51a0 with merge 6225262...

@bors
Copy link
Contributor

bors commented Nov 2, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 6225262 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 2, 2021
@bors bors merged commit 6225262 into rust-lang:master Nov 2, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 2, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6225262): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@hkratz hkratz deleted the use-curl-ca-bundle branch November 6, 2021 20:36
@cuviper cuviper mentioned this pull request Nov 16, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 19, 2021
[beta] backports

-  Fix assertion failures in OwnedHandle with windows_subsystem. rust-lang#88798
-  Ensure that pushing empty path works as before on verbatim paths rust-lang#89665
-  Feature gate + make must_not_suspend allow-by-default rust-lang#89826
-  Only use clone3 when needed for pidfd rust-lang#89930
-  Fix documentation header sizes rust-lang#90186
-  Fixes incorrect handling of ADT's drop requirements rust-lang#90218
-  Fix ICE when forgetting to Box a parameter to a Self::func call rust-lang#90221
-  Prevent duplicate caller bounds candidates by exposing default substs in Unevaluated rust-lang#90266
-  Update odht crate to 0.3.1 (big-endian bugfix) rust-lang#90403
-  rustdoc: Go back to loading all external crates unconditionally rust-lang#90489
-  Split doc_cfg and doc_auto_cfg features rust-lang#90502
-  Apply adjustments for field expression even if inaccessible rust-lang#90508
-  Warn for variables that are no longer captured rust-lang#90597
-  Properly register text_direction_codepoint_in_comment lint. rust-lang#90626
-  CI: Use ubuntu image to download openssl, curl sources, cacert.pem for x86 dist builds rust-lang#90457
-  Android is not GNU rust-lang#90834
-  Update llvm submodule rust-lang#90954

Additionally, this bumps the stage 0 compiler from beta to stable 1.56.1.

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants