Skip to content

Commit

Permalink
chore: restructure cargo workspace deps and fix 8xFF#122 (8xFF#125)
Browse files Browse the repository at this point in the history 
* chore: disable create release for each child crates

* chore: refactor workspaces deps
  • Loading branch information
@giangndm
giangndm authored Dec 21, 2023
1 parent 200bf9a commit 8c46983
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 33 deletions.
16 changes: 16 additions & 0 deletions .release-plz.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[workspace]
git_release_enable = false

[[package]]
name = "atm0s-media-server"
git_release_enable = true
changelog_include = [
"atm0s-media-server-cluster",
"atm0s-media-server-endpoint",
"atm0s-media-server-utils",
"atm0s-media-server-proc-macro",
"atm0s-media-server-transport",
"atm0s-media-server-transport-webrtc",
"atm0s-media-server-transport-sip",
"atm0s-media-server-transport-rtmp",
]
8 changes: 0 additions & 8 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ members = [
]

[workspace.dependencies]
cluster = { path = "packages/cluster", package = "atm0s-media-server-cluster", version = "0.1.0" }
endpoint = { path = "packages/endpoint", package = "atm0s-media-server-endpoint", version = "0.1.0" }
transport = { path = "packages/transport", package = "atm0s-media-server-transport", version = "0.1.0" }
transport-webrtc = { path = "transports/webrtc", package = "atm0s-media-server-transport-webrtc", version = "0.1.0" }
transport-rtmp = { path = "transports/rtmp", package = "atm0s-media-server-transport-rtmp", version = "0.1.0" }
transport-sip = { path = "transports/sip", package = "atm0s-media-server-transport-sip", version = "0.1.0" }
media-utils = { path = "packages/media-utils", package = "atm0s-media-server-utils", version = "0.1.0" }
proc-macro = { path = "packages/proc-macro", package = "atm0s-media-server-proc-macro", version = "0.1.0" }
futures = "0.3"
async-trait = "0.1"
async-std = { version = "1.12", features = ["tokio1", "unstable", "attributes"] }
Expand Down
8 changes: 4 additions & 4 deletions packages/cluster/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
transport = { workspace = true }
transport = { package = "atm0s-media-server-transport", path = "../transport", version = "0.1.0" }
media-utils = { package = "atm0s-media-server-utils", path = "../media-utils", version = "0.1.0" }
proc-macro = { package = "atm0s-media-server-proc-macro", path = "../proc-macro", version = "0.1.0" }
atm0s-sdn = { version = "0.1.4", features = ["all"], optional = true }
async-trait = { workspace = true }
serde = { workspace = true }
poem-openapi = { version = "3.0" }
media-utils = { workspace = true }
proc-macro = { workspace = true }
bincode = { version = "1" }

async-std = { workspace = true, optional = true }
log = { workspace = true, optional = true }
atm0s-sdn = { version = "0.1.4", features = ["all"], optional = true }
futures = { workspace = true, optional = true }
bytes = { version = "1.5", optional = true }

Expand Down
6 changes: 3 additions & 3 deletions packages/endpoint/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ description = "Media Endpoint for atm0s-media-server"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cluster = { package = "atm0s-media-server-cluster", path = "../cluster", version = "0.1.0" }
transport = { package = "atm0s-media-server-transport", path = "../transport", version = "0.1.0" }
media-utils = { package = "atm0s-media-server-utils", path = "../media-utils", version = "0.1.0" }
log = { workspace = true }
async-std = { workspace = true }
cluster = { workspace = true }
transport = { workspace = true }
media-utils = { workspace = true }
serde = { workspace = true }
futures = { workspace = true }
2 changes: 1 addition & 1 deletion packages/transport/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
media-utils = { package = "atm0s-media-server-utils", path = "../media-utils", version = "0.1.0" }
async-trait = { workspace = true }
async-std = { workspace = true }
media-utils = { workspace = true }
serde = { workspace = true }
14 changes: 7 additions & 7 deletions servers/media-server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ description = "Decentralized media-server with WebRTC/RTMP/Whip/Whep support"

[dependencies]
clap = { version = "4.4.11", features = ["derive", "env"] }
endpoint = { workspace = true }
transport = { workspace = true }
cluster = { workspace = true }
media-utils = { workspace = true }
endpoint = { package = "atm0s-media-server-endpoint", path = "../../packages/endpoint", version = "0.1.0" }
transport = { package = "atm0s-media-server-transport", path = "../../packages/transport", version = "0.1.0"}
cluster = { package = "atm0s-media-server-cluster", path = "../../packages/cluster", version = "0.1.0" }
media-utils = { package = "atm0s-media-server-utils", path = "../../packages/media-utils", version = "0.1.0" }
transport-webrtc = { package = "atm0s-media-server-transport-webrtc", path = "../../transports/webrtc", version = "0.1.0", optional = true }
transport-rtmp = { package = "atm0s-media-server-transport-rtmp", path = "../../transports/rtmp", version = "0.1.0", optional = true }
transport-sip = { package = "atm0s-media-server-transport-sip", path = "../../transports/sip", version = "0.1.0", optional = true }
async-std = { workspace = true }
async-trait = { workspace = true }
parking_lot = { workspace = true }
Expand All @@ -23,9 +26,6 @@ poem-openapi = { version = "3.0", features = ["swagger-ui", "static-files"] }
serde = { workspace = true }
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "std"] }
rust-embed = { version = "8.1", optional = true }
transport-webrtc = { workspace = true, optional = true }
transport-rtmp = { workspace = true, optional = true }
transport-sip = { workspace = true, optional = true }
rsip = { version = "0.4.0", optional = true }
metrics-dashboard = { version = "0.1.3", features = ["system"] }
metrics = "0.21.1"
Expand Down
6 changes: 3 additions & 3 deletions transports/rtmp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ description = "RTMP transport for atm0s-media-server"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
endpoint = { workspace = true }
transport = { workspace = true }
endpoint = { package = "atm0s-media-server-endpoint", path = "../../packages/endpoint", version = "0.1.0" }
transport = { package = "atm0s-media-server-transport", path = "../../packages/transport", version = "0.1.0"}
media-utils = { package = "atm0s-media-server-utils", path = "../../packages/media-utils", version = "0.1.0" }
async-std = { workspace = true }
async-trait = { workspace = true }
media-utils = { workspace = true }
rml_rtmp = "0.8"
log = { workspace = true }
futures = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions transports/sip/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
endpoint = { workspace = true }
transport = { workspace = true }
endpoint = { package = "atm0s-media-server-endpoint", path = "../../packages/endpoint", version = "0.1.0" }
transport = { package = "atm0s-media-server-transport", path = "../../packages/transport", version = "0.1.0"}
media-utils = { package = "atm0s-media-server-utils", path = "../../packages/media-utils", version = "0.1.0" }
async-std = { workspace = true }
async-trait = { workspace = true }
media-utils = { workspace = true }
log = { workspace = true }
futures = { workspace = true }
bytes = "1.5"
Expand Down
9 changes: 5 additions & 4 deletions transports/webrtc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ description = "Webrtc Transport for atm0s-media-server"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
endpoint = { workspace = true }
transport = { workspace = true }
cluster = { workspace = true }
endpoint = { package = "atm0s-media-server-endpoint", path = "../../packages/endpoint", version = "0.1.0" }
transport = { package = "atm0s-media-server-transport", path = "../../packages/transport", version = "0.1.0" }
media-utils = { package = "atm0s-media-server-utils", path = "../../packages/media-utils", version = "0.1.0" }
cluster = { package = "atm0s-media-server-cluster", path = "../../packages/cluster", version = "0.1.0" }
async-std = { workspace = true }
async-trait = { workspace = true }
media-utils = { workspace = true }

str0m = { version = "0.1.0", package = "atm0s-custom-str0m" }
futures = { workspace = true }
log = { workspace = true }
Expand Down

0 comments on commit 8c46983

Please sign in to comment.