ci: revert msys2 ca-certificates hack #65955
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
Ok this reviewer pick was a bit weird. r? @Mark-Simulacrum I guess? |
This comment has been minimized.
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
force-pushed
the
master-revert-msys2-hack
branch
from
9a7e602 to
48d6510
Compare
|
@bors r+ (Feel free to bump priority if necessary) |
|
📌 Commit 48d6510 has been approved by |
bors
added
S-waiting-on-bors
|
@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
added
S-waiting-on-author
|
@bors try |
|
⌛ Trying commit ed16fe0203f7dc8b4e819f28a2ec37ecd381b552 with merge 6699376114cbfa12ff74057c1d3e360b30974276... |
|
☀️ Try build successful - checks-azure |
pietroalbini
force-pushed
the
master-revert-msys2-hack
branch
from
ed16fe0 to
48d6510
Compare
|
@bors r=Mark-Simulacrum rollup Marking this as rollup as I already tested it works with the try build. |
|
📌 Commit 48d6510 has been approved by |
bors
added
S-waiting-on-bors
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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