Skip to content
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

build: move whole repo to workspace dependencies #2422

Closed
wants to merge 1 commit into from
Closed

build: move whole repo to workspace dependencies #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[build]
rustflags=['--cfg', 's2n_internal_dev']
rustdocflags=['--cfg', 's2n_internal_dev']

[alias]
xdp-xtask = "run --package xdp-xtask --"
17 changes: 17 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ members = [
"common/s2n-*",
"quic/s2n-*",
"dc/s2n-*",
"tools/memory-report",
"tools/udp-attack",
"tools/xdp/s2n-quic-xdp",
"tools/xdp/tester",
"tools/xdp/xtask",
]
default-members = [
"common/s2n-*",
Expand All @@ -18,6 +23,18 @@ exclude = [
[workspace.dependencies]
bolero = "0.12"
bolero-generator = { version = "0.12", default-features = false }
s2n-codec = { version = "=0.51.0", path = "./common/s2n-codec", default-features = false }
s2n-quic-core = { version = "=0.51.0", path = "./quic/s2n-quic-core", default-features = false }
s2n-quic-crypto = { version = "=0.51.0", path = "./quic/s2n-quic-crypto", default-features = false }
s2n-quic-h3 = { version = "=0.1.0", path = "./quic/s2n-quic-h3", default-features = false }
s2n-quic-platform = { version = "=0.51.0", path = "./quic/s2n-quic-platform", default-features = false }
s2n-quic-qns = { version = "=0.51.0", path = "./quic/s2n-quic-qns", default-features = false }
s2n-quic-rustls = { version = "=0.51.0", path = "./quic/s2n-quic-rustls", default-features = false }
s2n-quic-tls = { version = "=0.51.0", path = "./quic/s2n-quic-tls", default-features = false }
s2n-quic-tls-default = { version = "=0.51.0", path = "./quic/s2n-quic-tls-default", default-features = false }
s2n-quic-transport = { version = "=0.51.0", path = "./quic/s2n-quic-transport", default-features = false }
s2n-quic-xdp = { version = "=0.51.0", path = "./tools/xdp/s2n-quic-xdp", default-features = false }
s2n-quic = { version = "=1.51.0", path = "./quic/s2n-quic", default-features = false }

[profile.release-debug]
inherits = "dev"
Expand Down
4 changes: 2 additions & 2 deletions quic/s2n-quic-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ bytes = "1"
criterion = { version = "0.5", features = ["html_reports"] }
crossbeam-channel = { version = "0.5" }
internet-checksum = "0.2"
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }
s2n-codec = { workspace = true, features = ["testing"] }
s2n-quic-core = { workspace = true, features = ["testing"] }

[[bench]]
name = "bench"
Expand Down
4 changes: 2 additions & 2 deletions quic/s2n-quic-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ num-rational = { version = "0.4", default-features = false }
num-traits = { version = "0.2", default-features = false, features = ["libm"] }
pin-project-lite = { version = "0.2" }
probe = { version = "0.5", optional = true }
s2n-codec = { version = "=0.51.0", path = "../../common/s2n-codec", default-features = false }
s2n-codec = { workspace = true }
subtle = { version = "2", default-features = false }
tracing = { version = "0.1", default-features = false, optional = true }
zerocopy = { version = "0.7", features = ["derive"] }
Expand All @@ -56,7 +56,7 @@ futures = "0.3"
futures-test = "0.3"
ip_network = "0.4"
plotters = { version = "0.3", default-features = false, features = ["svg_backend", "line_series"] }
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }
s2n-codec = { workspace = true, features = ["testing"] }

[target.'cfg(loom)'.dev-dependencies]
loom = { version = "0.7", features = ["checkpoint", "futures"] }
Expand Down
6 changes: 3 additions & 3 deletions quic/s2n-quic-crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ testing = []
aws-lc-rs = { version = "1.9", features = ["prebuilt-nasm"] }
cfg-if = "1"
lazy_static = "1"
s2n-codec = { version = "=0.51.0", path = "../../common/s2n-codec", default-features = false }
s2n-quic-core = { version = "=0.51.0", path = "../s2n-quic-core", default-features = false }
s2n-codec = { workspace = true }
s2n-quic-core = { workspace = true }
zeroize = { version = "1", default-features = false, features = ["derive"] }

[dev-dependencies]
hex-literal = "0.4"
insta = { version = "1", features = ["json"] }
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }
s2n-quic-core = { workspace = true, features = ["testing"] }
2 changes: 1 addition & 1 deletion quic/s2n-quic-h3/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
bytes = { version = "1", default-features = false }
futures = { version = "0.3", default-features = false }
h3 = "0.0.6"
s2n-quic = { path = "../s2n-quic" }
s2n-quic = { workspace = true }
tracing = { version = "0.1", optional = true }

[features]
Expand Down
6 changes: 3 additions & 3 deletions quic/s2n-quic-platform/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ bolero-generator = { workspace = true, optional = true }
cfg-if = "1"
futures = { version = "0.3", default-features = false, features = ["async-await"], optional = true }
lazy_static = { version = "1", optional = true }
s2n-quic-core = { version = "=0.51.0", path = "../s2n-quic-core", default-features = false }
s2n-quic-xdp = { version = "=0.51.0", path = "../../tools/xdp/s2n-quic-xdp", optional = true }
s2n-quic-core = { workspace = true, default-features = false }
s2n-quic-xdp = { workspace = true, optional = true }
socket2 = { version = "0.5", features = ["all"], optional = true }
tokio = { version = "1", default-features = false, features = ["macros", "net", "rt", "time"], optional = true }
tracing = { version = "0.1", optional = true }
Expand All @@ -41,7 +41,7 @@ bolero.workspace = true
bolero-generator.workspace = true
futures = { version = "0.3", features = ["std"] }
insta = { version = "1", features = ["json"] }
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }
s2n-quic-core = { workspace = true, features = ["testing"] }
tokio = { version = "1", features = ["full"] }
tracing = { version = "0.1" }

Expand Down
14 changes: 7 additions & 7 deletions quic/s2n-quic-qns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ http = "1.0"
humansize = "2"
lru = "0.12"
rand = "0.8"
s2n-codec = { path = "../../common/s2n-codec" }
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }
s2n-quic-h3 = { path = "../s2n-quic-h3" }
s2n-codec = { workspace = true }
s2n-quic-core = { workspace = true, features = ["testing"] }
s2n-quic-h3 = { workspace = true }
structopt = "0.3"
tokio = { version = "1", features = ["full"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
url = "2"

[target.'cfg(unix)'.dependencies]
s2n-quic = { path = "../s2n-quic", features = ["provider-event-console-perf", "provider-event-tracing", "provider-tls-rustls", "provider-tls-s2n"] }
s2n-quic = { workspace = true, features = ["provider-event-console-perf", "provider-event-tracing", "provider-tls-rustls", "provider-tls-s2n"] }

[target.'cfg(not(unix))'.dependencies]
s2n-quic = { path = "../s2n-quic", features = ["provider-event-console-perf", "provider-event-tracing", "provider-tls-rustls"] }
s2n-quic = { workspace = true, features = ["provider-event-console-perf", "provider-event-tracing", "provider-tls-rustls"] }

# the mimalloc build is currently broken on android
[target.'cfg(not(target_os = "android"))'.dependencies]
Expand All @@ -45,9 +45,9 @@ mimalloc = { version = "0.1", default-features = false }
# Use unstable s2n-quic features
# unstable_client_hello and unstable_resumption use s2n-tls, and thus are only enabled for unix platforms
[target.'cfg(all(s2n_internal_dev, unix))'.dependencies]
s2n-quic = { path = "../s2n-quic", features = ["unstable_client_hello", "unstable_resumption"] }
s2n-quic = { workspace = true, features = ["unstable_client_hello", "unstable_resumption"] }
[target.'cfg(s2n_internal_dev)'.dependencies]
s2n-quic = { path = "../s2n-quic", features = ["unstable-provider-packet-interceptor"] }
s2n-quic = { workspace = true, features = ["unstable-provider-packet-interceptor"] }

[lints.rust.unexpected_cfgs]
level = "warn"
Expand Down
79 changes: 0 additions & 79 deletions quic/s2n-quic-qns/benchmark/client/Dockerfile.build
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions quic/s2n-quic-qns/benchmark/client/run_endpoint.sh
View file
Open in desktop

This file was deleted.

Loading
Loading