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.68] Backport fixes of split-debuginfo detection #11649

Merged
merged 5 commits into from
Jan 30, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Jan 29, 2023

Beta backports:

In order to make CI pass, the following PR are also cherry-picked:

…=weihanglo

Fix split-debuginfo support detection

### What does this PR try to resolve?
cargo assumed that if `-Csplit-debuginfo=packed` worked, all values would be correct. This however is not the case -- as of Rust 1.65.0, rustc supports `packed`, but not `unpacked` or `off` on Windows. Because of this, having `split-debuginfo="unpacked`" on Windows has caused builds to fail, as cargo assumed that the option is fine (`split-debuginfo=packed` worked), but rustc then failed when being passed `-Csplit-debuginfo=unpacked`.

### How should we test and review this PR?
Consider an empty project with the following change to `Cargo.toml`:
```toml
[profile.dev]
split-debuginfo="unpacked"
```
`cargo  1.64.0 build` will work, but `cargo  1.65.0 build` will fail with the following error message:

```
PS C:\REDACTED> cargo build
   Compiling tmp v0.1.0 (C:\REDACTED)
error: `-Csplit-debuginfo=unpacked` is unstable on this platform

error: could not compile `tmp` due to previous error
```

With this patch and 1.65.0 rustc, cargo will ignore all `split-debuginfo` settings, but with rust-lang/rust#104104 rustc (approved, awaiting merge), it will properly detect supported values for `split-debuginfo` and only ignore those that are unsupported.
…=ehuss

Reduce target info rustc query calls
@rustbot
Copy link
Collaborator

rustbot commented Jan 29, 2023

r? @ehuss

(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 Jan 29, 2023
test: Update for clap 4.1.3

The latest clap release fixed a bug with the algorithm for providing suggestions, leading this suggestion to change.
Temporarily pin libgit2-sys.

There are some issues with the most recent libgit2-sys 0.14.2 not working on Windows (libgit2/libgit2#6453 and libgit2/libgit2#6454). Until we figure out what to do with it, this pins the release to the previous version.
… r=epage

Disable network SSH tests on windows.

These tests have a high failure rate on Windows, so this disables them for now. I don't know exactly why they are failing. If I had to take a wild guess, I would suspect the use of WinCNG for the SSH backend, which may mean it is out of our control.
@weihanglo
Copy link
Member Author

Noticed that rustbot didn't warn us anymore for filing against a branch other than master.

image

@ehuss
Copy link
Contributor

ehuss commented Jan 30, 2023

@bors r

@bors
Copy link
Contributor

bors commented Jan 30, 2023

📌 Commit 6fe6437 has been approved by ehuss

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 Jan 30, 2023
@bors
Copy link
Contributor

bors commented Jan 30, 2023

⌛ Testing commit 6fe6437 with merge 2097626...

bors added a commit that referenced this pull request Jan 30, 2023
 [beta-1.68] Backport fixes of split-debuginfo detection

Beta backports:

* #11347 — Fix split-debuginfo support detection
* #11633 — Reduce target info rustc query calls

In order to make CI pass, the following PR are also cherry-picked:

* #11619
* #11609
* #11610
@bors
Copy link
Contributor

bors commented Jan 30, 2023

💔 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 Jan 30, 2023
@ehuss
Copy link
Contributor

ehuss commented Jan 30, 2023

@bors retry

GitHub Actions has encountered an internal error when running your job.

@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 Jan 30, 2023
@weihanglo
Copy link
Member Author

By the way, when we backport we are often required to backport unrelated PRs just to make CI happy, since we don't commit Cargo.lock. It may also make src/tools/cargo under rust-lang/rust fail to pass its test suites there, as the lockfile there is not in sync. That could be a good thing to figure out in the future updates.

@bors
Copy link
Contributor

bors commented Jan 30, 2023

⌛ Testing commit 6fe6437 with merge 0762e3b...

@bors
Copy link
Contributor

bors commented Jan 30, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 0762e3b to rust-1.68.0...

@bors bors merged commit 0762e3b into rust-lang:rust-1.68.0 Jan 30, 2023
@weihanglo weihanglo deleted the rust-1.68.0 branch January 31, 2023 08:03
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2023
1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c
2023-01-20 14:39:28  0000 to 2023-01-30 22:07:51  0000

- [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649)
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2023
[beta] Cargo 1.68.0 backports

1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c 2023-01-20 14:39:28  0000 to 2023-01-30 22:07:51  0000

- [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649)

r? `@ehuss`
@ehuss ehuss added this to the 1.68.0 milestone Feb 2, 2023
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.

4 participants