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.69] Change -C to be unstable #11961

Merged
merged 3 commits into from
Apr 12, 2023
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 12, 2023

Beta backport of #11960.

This also includes some other changes to get CI passing:

#11916 — Disable test_profile test on windows-gnu
Ignored some tests due to a change in clap output

ehuss and others added 3 commits April 11, 2023 19:42
Due to an update in the output from the latest clap, these tests no
longer pass. I think these aren't likely to have any regressions on beta
or stable, so they are just disabled for now.
…=weihanglo

Disable test_profile test on windows-gnu

This disables the `test_profile` test on windows-gnu due to a regression in nightly, see rust-lang/rust#109797.
@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2023

r? @weihanglo

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

@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2023

⚠️ Warning ⚠️

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

@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2023
@weihanglo
Copy link
Member

@bors r+

I'll update cargo submodule later on.

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit 9474349 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 Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

⌛ Testing commit 9474349 with merge 6e9a833...

@bors
Copy link
Contributor

bors commented Apr 12, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 6e9a833 to rust-1.69.0...

1 similar comment
@bors
Copy link
Contributor

bors commented Apr 12, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 6e9a833 to rust-1.69.0...

@bors
Copy link
Contributor

bors commented Apr 12, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@bors bors merged commit 6e9a833 into rust-lang:rust-1.69.0 Apr 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
…nglo

[beta-1.69] cargo backport

1 commits in 713164a40962a0a76c7f3ad8aafb6f03410e21d2..6e9a83356b70586d4b77613a6b33f9ea067b9cdf
2023-03-26 20:05:25 +0000 to 2023-04-12 10:18:25 +0000
- [beta 1.69] Change -C to be unstable (rust-lang/cargo#11961)

r? `@ghost`
@ehuss ehuss added this to the 1.69.0 milestone Apr 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation 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