Skip to content

ci: revert msys2 ca-certificates hack #65955

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 31, 2019

Conversation

pietroalbini
Copy link
Member

The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package.

Part of #65767

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(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 30, 2019
@pietroalbini
Copy link
Member Author

Ok this reviewer pick was a bit weird.

r? @Mark-Simulacrum I guess?

@rust-highfive

This comment has been minimized.

The hack was added because upstream msys2 broke the ca-certificates
package, but since then it has been fixed. This reverts CI to use the
upstream package.
@pietroalbini pietroalbini force-pushed the master-revert-msys2-hack branch from 9a7e602 to 48d6510 Compare October 30, 2019 08:41
@Mark-Simulacrum
Copy link
Member

@bors r+

(Feel free to bump priority if necessary)

@bors
Copy link
Collaborator

bors commented Oct 30, 2019

📌 Commit 48d6510 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 30, 2019
@pietroalbini
Copy link
Member Author

@bors r-

Actually, let me start a try build with a few windows builders, so if they pass we can rollup the PR and land it faster.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 2019
@pietroalbini
Copy link
Member Author

@bors try

@bors
Copy link
Collaborator

bors commented Oct 30, 2019

⌛ Trying commit ed16fe0203f7dc8b4e819f28a2ec37ecd381b552 with merge 6699376114cbfa12ff74057c1d3e360b30974276...

@bors
Copy link
Collaborator

bors commented Oct 30, 2019

☀️ Try build successful - checks-azure
Build commit: 6699376114cbfa12ff74057c1d3e360b30974276 (6699376114cbfa12ff74057c1d3e360b30974276)

@pietroalbini pietroalbini force-pushed the master-revert-msys2-hack branch from ed16fe0 to 48d6510 Compare October 30, 2019 17:50
@pietroalbini
Copy link
Member Author

@bors r=Mark-Simulacrum rollup

Marking this as rollup as I already tested it works with the try build.

@bors
Copy link
Collaborator

bors commented Oct 30, 2019

📌 Commit 48d6510 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 31, 2019
…ck, r=Mark-Simulacrum

ci: revert msys2 ca-certificates hack

The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package.

Part of rust-lang#65767
bors added a commit that referenced this pull request Oct 31, 2019
Rollup of 7 pull requests

Successful merges:

 - #65274 (Upload toolstates.json to rust-lang-ci2)
 - #65434 (Add long error explanation for E0577)
 - #65850 (Update comments re type parameter hack in object safety)
 - #65955 (ci: revert msys2 ca-certificates hack)
 - #65959 (Fix an incorrect docstring for Immediate in librustc_mir/interpret.)
 - #65979 (Switch CrateMetadata's source_map_import_info from RwLock to Once)
 - #65981 (work around aggressive syntax feature gating)

Failed merges:

r? @ghost
@bors bors merged commit 48d6510 into rust-lang:master Oct 31, 2019
@pietroalbini pietroalbini deleted the master-revert-msys2-hack branch November 7, 2019 08:07
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.

5 participants