-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
[stable-1.74] chore: bump cargo-credential-*
crates as e58b84d broke stuff
#13004
Merged
bors
merged 4 commits into
rust-lang:rust-1.74.0
from
weihanglo:rust-1.74.0-bump-credential
Nov 20, 2023
Merged
[stable-1.74] chore: bump cargo-credential-*
crates as e58b84d broke stuff
#13004
bors
merged 4 commits into
rust-lang:rust-1.74.0
from
weihanglo:rust-1.74.0-bump-credential
Nov 20, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e58b84d changed the shape of response of cargo credential protocol trait, so credential plugins crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depends on the same major version of `cargo-credential` otherwise incompatible.
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
|
rustbot
added
A-credential-provider
Area: credential provider for storing and retreiving credentials
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Nov 19, 2023
weihanglo
changed the title
chore: bump
[stable-1.74] chore: bump Nov 19, 2023
cargo-credential-*
crates as e58b84d broke stuffcargo-credential-*
crates as e58b84d broke stuff
rustbot
added
the
A-dependency-resolution
Area: dependency resolution and the resolver
label
Nov 19, 2023
Compiler plugins were removed in rust-lang/rust#116412, so we don't need these tests. As for the `plugin` field on build-targets, it appears to be [stable-but-deprecated](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-plugin-field), so I left it alone
rustbot
added
the
A-infrastructure
Area: infrastructure around the cargo repo, ci, releases, etc.
label
Nov 19, 2023
weihanglo
added a commit
to weihanglo/cargo
that referenced
this pull request
Nov 19, 2023
845c1bc e58b84d changed the shape of response of cargo credential protocol trait, so credential plugins crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depends on the same major version of `cargo-credential` otherwise incompatible. See rust-lang#13004 for more.
weihanglo
added a commit
to weihanglo/cargo
that referenced
this pull request
Nov 19, 2023
e58b84d changed the shape of response of cargo credential protocol trait, so credential plugins crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depends on the same major version of `cargo-credential` otherwise incompatible. See rust-lang#13004 for more.
weihanglo
added a commit
to weihanglo/cargo
that referenced
this pull request
Nov 19, 2023
e58b84d changed the shape of response of cargo credential protocol trait, so credential plugins crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depends on the same major version of `cargo-credential` otherwise incompatible. This PR * bumps the version to `cargo-credential-wincred@0.4.2` * bumps the version to `cargo-credential-macos-keychain@0.4.2` * bumps the version to `cargo-credential-li@0.4.2` See rust-lang#13004 for more.
I think that strategy sounds correct. Thank you! @bors r+ |
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 20, 2023
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Nov 20, 2023
[beta-1.75.0] chore: bump `cargo-credential-*` crates as e58b84d broke stuff e58b84d changed the shape of response of cargo credential protocol trait, so credential plugins crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depends on the same major version of `cargo-credential` otherwise incompatible. This PR * bumps the version to `cargo-credential-wincred@0.4.1` * bumps the version to `cargo-credential-macos-keychain@0.4.1` * bumps the version to `cargo-credential-li@0.4.1` See #13004 for more.
bors
added a commit
that referenced
this pull request
Nov 20, 2023
chore: bump `cargo-credential-*` crates as e58b84d broke stuff e58b84d changed the shape of response of cargo credential protocol trait, so credential plugin crates effectively depend on `cargo-credential@0.4.0`. However, `cargo@0.74.0` still depends on`cargo-credential@0.3.0`. They must depend on the same major version of `cargo-credential` otherwise incompatible. This PR * bumps the version to `cargo-credential-wincred@0.4.2` * bumps the version to `cargo-credential-macos-keychain@0.4.2` * bumps the version to `cargo-credential-li@0.4.2` See #13004 for more.
bors
added a commit
that referenced
this pull request
Nov 20, 2023
[stable 1.74] Bump cargo patch version #13004 bumped the credential crate versions to deal with a semver-incompatible change, but I believe we also need to bump and publish cargo. My thinking is that: * cargo 0.75.0 currently depends on cargo-credential-libsecret="0.3.1" * The `Cargo.lock` is locked to **0.3.2** * We plan to yank cargo-credential-libsecret 0.3.2 * Users who depend on cargo 0.75.0 as a library will be unable to do so since after yanking it will pick up cargo-credential-libsecret="0.3.1", but this won't work. * cargo 0.75.0 -> cargo-credential 0.4.0 * cargo-credential-libsecret 0.3.1 -> cargo-credential **0.3.0** (Users using a `Cargo.lock`, like doing rust builds, shouldn't be affected by the yank.) So, after publishing the new credential crates, I think we'll also need to publish a new 0.75.1 which depends on the correct versions so that users can use 0.75. It also probably makes sense to yank 0.75.0.
Sorry, I don't mean to look over your shoulder, but these steps still need to be performed? |
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-credential-provider
Area: credential provider for storing and retreiving credentials
A-dependency-resolution
Area: dependency resolution and the resolver
A-infrastructure
Area: infrastructure around the cargo repo, ci, releases, etc.
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
e58b84d changed the shape of response of cargo credential protocol trait,
so credential plugins crates effectively depend on
cargo-credential@0.4.0
.However,
cargo@0.74.0
still depends oncargo-credential@0.3.0
.They must depends on the same major version of
cargo-credential
otherwise incompatible.
Addresses #13002
In order to make CI pass, the following PRs are also cherry-picked:
cargo-semver-checks
to 0.24.0 for supporting rustdoc json v27 (the version staring from Rust 1.74.0)How should we test and review this PR?
To-dos after PRs against each branch get merged:
rust-1.74.0
branchcargo-credential-wincred@0.4.0
cargo-credential-macos-keychain@0.4.0
cargo-credential-li@0.4.0
rust-1.75.0
branchcargo-credential-wincred@0.4.1
cargo-credential-macos-keychain@0.4.1
cargo-credential-li@0.4.1
master
branch`cargo-credential-wincred@0.4.2
cargo-credential-macos-keychain@0.4.2
cargo-credential-li@0.4.2
cargo-credential-wincred@0.3.1
cargo-credential-macos-keychain@0.3.1
cargo-credential-libsecret@0.3.2
Not sure if it is necessary to publish a new version of
0.3.x
crates forcargo-credential-*
before yanking, so I didn't put it in this plan.