Use workspace dependencies for smb-* crates too.

Move smb-cli outside of crates/
Make the CI shorter

Author: afiffon

.github/workflows/build.yml

@@ -59,22 +59,18 @@ jobs:
         run: |
           rustup component add clippy
           cargo clippy --verbose --no-default-features --features "${{ matrix.compile_features }},${COMMON_FEATURES}" -- -Dclippy::all
+      - name: Build/${{ matrix.compile_features }}
+        run: |
+          cargo build --no-default-features --features "${{ matrix.compile_features }},${COMMON_FEATURES}"
       - name: Tests/${{ matrix.compile_features }}
         run: |
-          cargo test -p smb-msg --features client --no-default-features -- --nocapture
           cargo test -p smb-msg --features server --no-default-features -- --nocapture
           cargo test -p smb-msg --features both --no-default-features -- --nocapture
 
+          # Full client tests with all features
           cargo test --no-default-features --features "${{ matrix.compile_features }},${COMMON_FEATURES}" -- --nocapture
-          # Test without encryption and compression
-          cargo test --no-default-features --features "${{ matrix.compile_features }},sign" -- --nocapture
-          # Test signing with specific algorithms
-          cargo test --no-default-features --features "${{ matrix.compile_features }},sign_cmac" -- --nocapture
-          cargo test --no-default-features --features "${{ matrix.compile_features }},sign_gmac" -- --nocapture
-          cargo test --no-default-features --features "${{ matrix.compile_features }},sign_hmac" -- --nocapture
-      - name: Build/${{ matrix.compile_features }}
+      - name: Doc/${{ matrix.compile_features }}
         run: |
-          cargo build --no-default-features --features "${{ matrix.compile_features }},${COMMON_FEATURES}"
           cargo doc --no-default-features --features "${{ matrix.compile_features }},${COMMON_FEATURES}"
 
   build:

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["crates/*"]
+members = ["crates/*", "smb-cli"]
 resolver = "2"
 
 [workspace.package]
@@ -16,6 +16,19 @@ readme = "README.md"
 version = "0.10.4"
 
 [workspace.dependencies]
+# Crates in this workspace
+smb = { path = "crates/smb", version = "0.10.4" }
+smb-tests = { path = "crates/smb-tests", version = "0.10.4" }
+smb-msg = { path = "crates/smb-msg", version = "0.10.4", default-features = false, features = [
+    "client",
+] }
+smb-msg-derive = { path = "crates/smb-msg-derive", version = "0.10.4" }
+smb-dtyp = { path = "crates/smb-dtyp", version = "0.10.4" }
+smb-dtyp-derive = { path = "crates/smb-dtyp-derive", version = "0.10.4" }
+smb-rpc = { path = "crates/smb-rpc", version = "0.10.4" }
+smb-fscc = { path = "crates/smb-fscc", version = "0.10.4" }
+smb-transport = { path = "crates/smb-transport", version = "0.10.4", default-features = false }
+
 # Binary encoding/decoding
 binrw = "0.15.0"
 modular-bitfield = "0.11.2"

crates/smb-dtyp/Cargo.toml

@@ -17,7 +17,7 @@ modular-bitfield = { workspace = true }
 time = { workspace = true }
 pastey = { workspace = true }
 rand = { workspace = true }
-smb-dtyp-derive = { path = "../smb-dtyp-derive", version = "0.10.3" }
+smb-dtyp-derive = { workspace = true }
 
 [dev-dependencies]
-smb-tests = { path = "../smb-tests", version = "0.10.4" }
+smb-tests = { workspace = true }

crates/smb-fscc/Cargo.toml

@@ -12,7 +12,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-smb-dtyp = { path = "../smb-dtyp", version = "0.10.4" }
+smb-dtyp = { workspace = true }
 
 binrw = { workspace = true }
 modular-bitfield = { workspace = true }
@@ -21,5 +21,5 @@ pastey = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-smb-tests = { path = "../smb-tests", version = "0.10.4" }
+smb-tests = { workspace = true }
 const_format = { workspace = true }

crates/smb-msg/Cargo.toml

@@ -21,9 +21,9 @@ server = []
 both = ["client", "server"]
 
 [dependencies]
-smb-dtyp = { path = "../smb-dtyp", version = "0.10.4" }
-smb-fscc = { path = "../smb-fscc", version = "0.10.4" }
-smb-msg-derive = { path = "../smb-msg-derive", version = "0.10.4" }
+smb-dtyp = { workspace = true }
+smb-fscc = { workspace = true }
+smb-msg-derive = { workspace = true }
 
 binrw = { workspace = true }
 modular-bitfield = { workspace = true }
@@ -32,5 +32,5 @@ pastey = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-smb-tests = { path = "../smb-tests", version = "0.10.4" }
+smb-tests = { workspace = true }
 const_format = { workspace = true }

crates/smb-rpc/Cargo.toml

@@ -12,7 +12,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-smb-dtyp = { path = "../smb-dtyp", version = "0.10.4" }
+smb-dtyp = { workspace = true }
 
 binrw = { workspace = true }
 modular-bitfield = { workspace = true }
@@ -22,7 +22,7 @@ maybe-async = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-smb-tests = { path = "../smb-tests", version = "0.10.4" }
+smb-tests = { workspace = true }
 
 [features]
 default = []

crates/smb-transport/Cargo.toml

@@ -12,8 +12,8 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-smb-dtyp = { path = "../smb-dtyp", version = "0.10.4" }
-smb-msg = { path = "../smb-msg", version = "0.10.4", optional = true }
+smb-dtyp = { workspace = true }
+smb-msg = { workspace = true, optional = true }
 
 log = { workspace = true }
 tokio = { workspace = true, features = [
@@ -45,7 +45,7 @@ maybe-async = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-smb-tests = { path = "../smb-tests", version = "0.10.4" }
+smb-tests = { workspace = true }
 
 [features]
 default = ["async", "netbios-transport"]

crates/smb/Cargo.toml

@@ -12,11 +12,11 @@ categories.workspace = true
 readme.workspace = true
 
 [dependencies]
-smb-msg = { path = "../smb-msg", version = "0.10.4", default-features = false, features = ["client"]}
-smb-dtyp = { path = "../smb-dtyp", version = "0.10.4" }
-smb-rpc = { path = "../smb-rpc", version = "0.10.4" }
-smb-fscc = { path = "../smb-fscc", version = "0.10.4" }
-smb-transport = { path = "../smb-transport", version = "0.10.4", default-features = false }
+smb-msg = { workspace = true }
+smb-dtyp = { workspace = true }
+smb-rpc = { workspace = true }
+smb-fscc = { workspace = true }
+smb-transport = { workspace = true }
 
 # Encoding/Decoding
 binrw = { workspace = true }

crates/smb/tests/dialects.rs

@@ -1,5 +1,3 @@
-#![cfg(all(feature = "sign", feature = "encrypt"))]
-
 use common::{TestConstants, make_server_connection};
 #[cfg(feature = "async")]
 use futures_util::StreamExt;
@@ -36,7 +34,12 @@ macro_rules! basic_test {
 
 }
 
+// Encryption tests, adapt to current features
+#[cfg(feature = "__encrypt_core")]
 basic_test!([Smb030, Smb0302, Smb0311], [Disabled, Required]);
+#[cfg(not(feature = "__encrypt_core"))]
+basic_test!([Smb030, Smb0302, Smb0311], [Disabled]);
+
 basic_test!([Smb0202, Smb021], [Disabled]);
 
 #[maybe_async::maybe_async]

crates/smb/tests/long_dir.rs

@@ -1,5 +1,3 @@
-#![cfg(all(feature = "sign", feature = "encrypt"))]
-
 use serial_test::serial;
 use smb::{ConnectionConfig, Directory, connection::EncryptionMode, sync_helpers::*, tree::Tree};
 use smb_fscc::*;