Skip to content

Move swss-common/swss-common-testing to sonic-swss-common repo #86

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.

Sign up for GitHub

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

Merged
r12f merged 4 commits into from
Jul 21, 2025
Merged

Move swss-common/swss-common-testing to sonic-swss-common repo #86

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f7ff26
Move swss-common/swss-common-testing to sonic-swss-common repo
qiluo-msft Jul 16, 2025
3e4cdeb
Fix: dependency of swss-common need async feature
qiluo-msft Jul 17, 2025
5f41b1d
Use public repo instead of dev repo
qiluo-msft Jul 18, 2025
9c405aa
Merge branch 'master' into qiluo/movecommon
qiluo-msft Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Cargo.toml
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@r12f r12f Jul 18, 2025 •
edited by qiluo-msft
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargo lock seems to be missing, will be great to add. otherwise dependency can easily break build. #Resolved

Copy link
Copy Markdown
Contributor Author

@qiluo-msft qiluo-msft Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added Cargo.lock

Copy link
Copy Markdown
Collaborator

@r12f r12f Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you so much!!

Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ members = [
"crates/swbus-core",
"crates/swbusd",
"crates/hamgrd",
"crates/swss-common",
"crates/swss-common-testing",
"crates/swss-serde",
"crates/swbus-edge",
"crates/swbus-proto",
Expand Down Expand Up @@ -92,8 +90,6 @@ swbus-core = { version = "0.1.0", path = "crates/swbus-core" }
swbus-edge = { version = "0.1.0", path = "crates/swbus-edge" }
swbus-config = { version = "0.1.0", path = "crates/swbus-config" }
swss-serde = { version = "0.1.0", path = "crates/swss-serde" }
swss-common = { version = "0.1.0", path = "crates/swss-common" }
swss-common-testing = { version = "0.1.0", path = "crates/swss-common-testing" }
swbus-actor = { version = "0.1.0", path = "crates/swbus-actor" }
sonicdb-derive = { version = "0.1.0", path = "crates/sonicdb-derive" }

Expand Down
2 changes: 1 addition & 1 deletion crates/container/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ chrono = { workspace = true }
enumset = { workspace = true }
futures-util = { workspace = true }
clap = { workspace = true }
swss-common = { path = "../swss-common" }
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
Copy link
Copy Markdown
Collaborator

@r12f r12f Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer to also add a commit id.

Copy link
Copy Markdown
Collaborator

@r12f r12f Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargo.lock has it covered now. great!

tokio = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/hamgrd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ edition.workspace = true
[dependencies]
swbus-edge = { path = "../swbus-edge" }
swbus-actor = { path = "../swbus-actor" }
swss-common = { path = "../swss-common" }
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
swss-common-bridge = { path = "../swss-common-bridge" }
swss-serde = { path = "../swss-serde" }
swss-common-testing.workspace = true
swss-common-testing = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
swbus-config.workspace = true
sonic-common.workspace = true
sonicdb-derive.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/sonic-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ signal-hook.workspace = true
color-eyre.workspace = true

# internal dependencies
swss-common.workspace = true
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }

# Utils
lazy_static.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/sonicdb-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition.workspace = true
syn = "2.0" # For parsing Rust code
quote = "1.0" # For generating Rust code
proc-macro2 = "1.0" # For working with procedural macros
swss-common.workspace = true
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }

[lib]
proc-macro = true
Expand Down
4 changes: 2 additions & 2 deletions crates/swbus-actor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition.workspace = true

[dependencies]
swbus-edge = { path = "../swbus-edge" }
swss-common = { path = "../swss-common", features = ["async"] }
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate", features = ["async"] }
tokio.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand All @@ -22,4 +22,4 @@ tracing.workspace = true
workspace = true

[dev-dependencies]
swss-common-testing = { path = "../swss-common-testing" }
swss-common-testing = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
4 changes: 2 additions & 2 deletions crates/swbus-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ swbus-config.workspace = true
swbus-actor.workspace = true

[dev-dependencies]
swss-common-testing.workspace = true
swss-common.workspace = true
swss-common-testing = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
swss-serde.workspace = true

[lints]
Expand Down
4 changes: 2 additions & 2 deletions crates/swbus-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ serde_json.workspace = true
thiserror.workspace = true
tracing.workspace = true
swss-serde.workspace = true
swss-common.workspace = true
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
swbus-proto.workspace = true

[dev-dependencies]
swss-common-testing.workspace = true
swss-common-testing = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
tempfile.workspace = true

[lints]
Expand Down
4 changes: 2 additions & 2 deletions crates/swss-common-bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords.workspace = true
edition.workspace = true

[dependencies]
swss-common = { path = "../swss-common", features = ["async"] }
swss-common = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate", features = ["async"] }
swbus-edge = { path = "../swbus-edge" }
tokio.workspace = true
tokio-util.workspace = true
Expand All @@ -19,4 +19,4 @@ swbus-actor = { path = "../swbus-actor" }
workspace = true

[dev-dependencies]
swss-common-testing = { path = "../swss-common-testing" }
swss-common-testing = { git = "https://github.com/qiluo-msft/sonic-swss-common.git", branch = "qiluo/rustcrate" }
17 changes: 0 additions & 17 deletions crates/swss-common-testing/Cargo.toml
View file
Open in desktop

This file was deleted.

268 changes: 0 additions & 268 deletions crates/swss-common-testing/src/lib.rs
View file
Open in desktop

This file was deleted.

Loading