Skip to content

Commit

Permalink
Auto merge of #12521 - arlosi:cred-libsecret, r=epage
Browse files Browse the repository at this point in the history
Make cargo-credential-gnome-secret built-in as cargo:libsecret

We previously couldn't have cargo-credential-gnome-secret built into Cargo because of its build-time dependency on `libsecret`. However, this limitation has now been lifted by #12518.

Adds a new built-in credential provider `cargo:libsecret`.

Adds `ISC` as an allowed license for `libloading`.
* `rustc` already uses `libloading`
* ISC license is very similar to MIT

Renames the crate from `cargo-credential-gnome-secret` to `cargo-credential-libsecret` and changes the crate structure to more closely match `wincred` and `macos-keychain`.
  • Loading branch information
bors committed Aug 17, 2023
2 parents 37a0514 + 763edba commit 2b1f87c
Show file tree
Hide file tree
Showing 11 changed files with 245 additions and 257 deletions.
3 changes: 2 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ base64 = "0.21.2"
bytesize = "1.2"
cargo = { path = "" }
cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" }
cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" }
Expand Down Expand Up @@ -123,6 +124,7 @@ base64.workspace = true
bytesize.workspace = true
cargo-platform.workspace = true
cargo-credential.workspace = true
cargo-credential-libsecret.workspace = true
cargo-credential-macos-keychain.workspace = true
cargo-credential-wincred.workspace = true
cargo-util.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/xtask-bump-check/src/xtask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ fn bump_check(args: &clap::ArgMatches, config: &mut cargo::util::Config) -> Carg
"--exclude",
"cargo-credential-1password",
"--exclude",
"cargo-credential-gnome-secret",
"cargo-credential-libsecret",
"--exclude",
"cargo-credential-macos-keychain",
"--exclude",
Expand Down
226 changes: 0 additions & 226 deletions credential/cargo-credential-gnome-secret/src/libsecret.rs

This file was deleted.

12 changes: 0 additions & 12 deletions credential/cargo-credential-gnome-secret/src/main.rs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "cargo-credential-gnome-secret"
name = "cargo-credential-libsecret"
version = "0.3.1"
edition.workspace = true
license.workspace = true
Expand All @@ -10,4 +10,3 @@ description = "A Cargo credential process that stores tokens with GNOME libsecre
anyhow.workspace = true
cargo-credential.workspace = true
libloading.workspace = true

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cargo-credential-gnome-secret
# cargo-credential-libsecret

This is the implementation for the Cargo credential helper for [GNOME libsecret].
See the [credential-process] documentation for how to use this.
Expand Down
Loading

0 comments on commit 2b1f87c

Please sign in to comment.