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-1.66] Backport fix for git2 safe-directory disable #11381

Merged
merged 3 commits into from Nov 15, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Nov 15, 2022

Beta backports:

Fix git2 safe-directory disable

The call to `set_verify_owner_validation` was not getting called unless a network configuration was found. This means in the common case that `cargo new` will fail when there is a safe-directory error. This fixes the issue by making sure that `set_verify_owner_validation` is called before the early-exits in `init_git_transports`.

Fixes rust-lang#11365
@rustbot
Copy link
Collaborator

rustbot commented Nov 15, 2022

r? @weihanglo

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 15, 2022
@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 15, 2022

📌 Commit 6774bc1 has been approved by weihanglo

It is now in the queue for this repository.

@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 15, 2022
@bors
Copy link
Collaborator

bors commented Nov 15, 2022

⌛ Testing commit 6774bc1 with merge 20e4f60...

bors added a commit that referenced this pull request Nov 15, 2022
[beta-1.66] Backport fix for git2 safe-directory disable

This is a beta backport of #11366.
@bors
Copy link
Collaborator

bors commented Nov 15, 2022

💔 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 15, 2022
fix(semver-check): adapt to a different error for variant not covered
Clean more aggressively in CI

The Windows x86_64 gnu CI job is running dangerously low on disk space. This PR adds another step to delete test output more aggressively. The test output with x86_64-pc-windows-gnu is nearly 9.5GB. The benchmark step is adding about 1GB of space (unfortunately it is rebuilding cargo, which may be hard to avoid without a workspace).

Eventually we should probably look at figuring out how to reduce the amount of disk space used by the testsuite. Perhaps something like rust-lang#9701 (see comments there). Or, making aggressive changes to the tests themselves. Many tests can probably be changed to use `cargo check` instead of `cargo build` (or maybe even `cargo tree`). We can default to not generating debuginfo. Or perhaps there are other changes to put the tests on a diet.
@ehuss
Copy link
Contributor Author

ehuss commented Nov 15, 2022

I added #11332 and #11335 to get CI passing.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 15, 2022

📌 Commit 4d1d2b2 has been approved by weihanglo

It is now in the queue for this repository.

@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 15, 2022
@bors
Copy link
Collaborator

bors commented Nov 15, 2022

⌛ Testing commit 4d1d2b2 with merge d65d197...

@bors
Copy link
Collaborator

bors commented Nov 15, 2022

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing d65d197 to rust-1.66.0...

@bors bors merged commit d65d197 into rust-lang:rust-1.66.0 Nov 15, 2022
Mark-Simulacrum pushed a commit to Mark-Simulacrum/rust that referenced this pull request Nov 20, 2022
1 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..d65d197ad5c6c09234369f219f943e291d4f04b9
2022-10-27 15:20:57 +0000 to 2022-11-15 21:30:31 +0000
- [beta-1.66] Backport fix for git2 safe-directory disable (rust-lang/cargo#11381)
@ehuss ehuss added this to the 1.66.0 milestone Dec 14, 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.

None yet

4 participants