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 #11674

Merged
merged 2 commits into from
Feb 9, 2023
Merged

Conversation

weihanglo
Copy link
Member

Beta backports:

…Eh2406

Do not error for `auth-required: true` without `-Z sparse-registry`

Registries that include `auth-required: true` in their `config.json` currently hit the following error on stable:
```
authenticated registries require `-Z registry-auth`
```

This situation makes it difficult for a registry to optionally offer the `auth-required: true` feature, since it forces users on to the nightly toolchain.

This PR changes the behavior to ignore the `auth-required: true` field of `config.json` without `-Z registry-auth`.

The downside to this change is that it makes it harder to discover why a registry isn't working, since the user will get an HTTP 401 error from the server, rather than a message from Cargo suggesting adding `-Z registry-auth`.

r? `@Eh2406`
@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

r? @epage

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

@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

⚠️ Warning ⚠️

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 3, 2023
@weihanglo
Copy link
Member Author

@rust-lang/cargo any objection or concern?

@weihanglo
Copy link
Member Author

This is able to be merged, as the CI error in nightly has been fixed.

@epage
Copy link
Contributor

epage commented Feb 8, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 8, 2023

📌 Commit 9faaba0 has been approved by epage

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 Feb 8, 2023
@bors
Copy link
Collaborator

bors commented Feb 8, 2023

⌛ Testing commit 9faaba0 with merge b8eb980...

bors added a commit that referenced this pull request Feb 8, 2023
 [beta-1.68] Backport fixes

Beta backports:

* #11661 — Do not error for `auth-required: true` without `-Z sparse-registry`
* #11672 — Verify source before recompile
@bors
Copy link
Collaborator

bors commented Feb 8, 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 Feb 8, 2023
@weihanglo
Copy link
Member Author

💔 Test failed - checks-actions

My mistake 😅. Need to wait one more day.

@ehuss
Copy link
Contributor

ehuss commented Feb 9, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 9, 2023

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Collaborator

bors commented Feb 9, 2023

📌 Commit 9faaba0 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 Feb 9, 2023
@bors
Copy link
Collaborator

bors commented Feb 9, 2023

⌛ Testing commit 9faaba0 with merge ddf05ad...

@bors
Copy link
Collaborator

bors commented Feb 9, 2023

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

@bors bors merged commit ddf05ad into rust-lang:rust-1.68.0 Feb 9, 2023
weihanglo added a commit to weihanglo/rust that referenced this pull request Feb 9, 2023
1 commits in 0762e3bbdb6fa64b6859154199ec47d6c90c731c..ddf05ad7a66f4cfbe79d7692b84aa144c1aac34d
2023-01-30 22:07:51 +0000 to 2023-02-09 03:13:43 +0000
- [beta-1.68] Backport fixes (rust-lang/cargo#11674)
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2023
…nglo

[beta-1.68] cargo beta backports

1 commits in 0762e3bbdb6fa64b6859154199ec47d6c90c731c..ddf05ad7a66f4cfbe79d7692b84aa144c1aac34d 2023-01-30 22:07:51 +0000 to 2023-02-09 03:13:43 +0000
- [beta-1.68] Backport fixes (rust-lang/cargo#11674)

r? `@ghost`
@ehuss ehuss added this to the 1.68.0 milestone Mar 9, 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.

5 participants