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

[beta] backport libgit2 #8780

Merged
merged 2 commits into from
Oct 14, 2020
Merged

[beta] backport libgit2 #8780

merged 2 commits into from
Oct 14, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Oct 14, 2020

This is a backport of #8778 to beta. The reason is that #8517 has started showing up again on rust-lang/rust CI, and I think it is important to fix that.

This is risky, because this is a large update with a lot of untested changes. However, I think the risk is worth it to fix #8517.

This also includes #8772 to get Cargo's CI to pass. I think the risk for that is low (the changes are small). However, I'd be fine with just modifying the tests to pass if you want to drop it.

bors added 2 commits October 14, 2020 07:34
Update git2.

Closes rust-lang#8517
Closes rust-lang#8588
Closes rust-lang#8352
Closes rust-lang#4777
Closes rust-lang#8746

I only added a test for one of these. I can add for the others if you want.
@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.48.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2020
@alexcrichton
Copy link
Member

@bors: r+

Nah I think this is a good idea to backport for all the fixes, and we should have some time before shipping anyway to weed out any other issues.

@bors
Copy link
Contributor

bors commented Oct 14, 2020

📌 Commit bb66e0f has been approved by alexcrichton

@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 14, 2020
@bors
Copy link
Contributor

bors commented Oct 14, 2020

⌛ Testing commit bb66e0f with merge 65cbdd2...

@bors
Copy link
Contributor

bors commented Oct 14, 2020

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 65cbdd2 to rust-1.48.0...

@bors bors merged commit 65cbdd2 into rust-lang:rust-1.48.0 Oct 14, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2020
…acrum

[beta] Update cargo

1 commits in 75615f8e69f748d7ef0df7bc0b064a9b1f5c78b2..65cbdd2dc0b7e877577474b98b7d071308d0bb6f
2020-09-29 18:42:19 +0000 to 2020-10-14 16:10:15 +0000
- [beta] backport libgit2 (rust-lang/cargo#8780)

This is primarily to bring in a fix for rust-lang/cargo#8517 which is starting to show up on rust-lang/rust's CI again.
@ehuss ehuss added this to the 1.48.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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