From 61a513c1a88c1b5c8847a97af6015a762d31ab6a Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 24 Apr 2023 14:48:06 +0100 Subject: [PATCH 1/2] chore: make credential dependencies platform-specific --- credential/cargo-credential-macos-keychain/Cargo.toml | 2 ++ credential/cargo-credential-wincred/Cargo.toml | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml index c2c22a425ae..428e291002e 100644 --- a/credential/cargo-credential-macos-keychain/Cargo.toml +++ b/credential/cargo-credential-macos-keychain/Cargo.toml @@ -8,4 +8,6 @@ description = "A Cargo credential process that stores tokens in a macOS keychain [dependencies] cargo-credential = { version = "0.2.0", path = "../cargo-credential" } + +[target.'cfg(target_os = "macos")'.dependencies] security-framework = "2.0.0" diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml index 64f3496383a..81325346690 100644 --- a/credential/cargo-credential-wincred/Cargo.toml +++ b/credential/cargo-credential-wincred/Cargo.toml @@ -8,4 +8,10 @@ description = "A Cargo credential process that stores tokens with Windows Creden [dependencies] cargo-credential = { version = "0.2.0", path = "../cargo-credential" } -windows-sys = { version = "0.48", features = ["Win32_Foundation", "Win32_Security_Credentials"] } + +[target.'cfg(windows)'.dependencies.windows-sys] +version = "0.48" +features = [ + "Win32_Foundation", + "Win32_Security_Credentials" +] From ad6c4144cc8eedd2fa74803855cc12bea465f811 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 24 Apr 2023 13:43:24 +0100 Subject: [PATCH 2/2] ci: remove unnecessary condition for building cargo-credential-* --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 303082018d5..04fd9bf2e6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -128,12 +128,10 @@ jobs: - run: cargo test -p home - run: cargo test -p mdman - run: cargo build -p cargo-credential-1password - - run: cargo build -p cargo-credential-gnome-secret - if: matrix.os == 'ubuntu-latest' - run: cargo build -p cargo-credential-macos-keychain - if: matrix.os == 'macos-latest' - run: cargo build -p cargo-credential-wincred - if: matrix.os == 'windows-latest' + - run: cargo build -p cargo-credential-gnome-secret + if: matrix.os == 'ubuntu-latest' - name: Check benchmarks run: | # This only tests one benchmark since it can take over 10 minutes to