Skip to content

Commit

Permalink
Move dependencies to workspace
Browse files Browse the repository at this point in the history
Add "{{project-name}}-ebpf" to workspace. Update various cargo configs
to match main aya repo.
  • Loading branch information
tamird committed Oct 10, 2024
1 parent e064758 commit c4cfd0b
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 37 deletions.
2 changes: 0 additions & 2 deletions .cargo/config.toml

This file was deleted.

2 changes: 0 additions & 2 deletions .cargo/rust-analyzer.toml

This file was deleted.

18 changes: 17 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
[workspace]
resolver = "2"
members = ["xtask", "{{project-name}}", "{{project-name}}-common"]
members = ["xtask", "{{project-name}}", "{{project-name}}-common", "{{project-name}}-ebpf"]

[workspace.dependencies]
aya = { version = "0.13.0", default-features = false }
aya-ebpf = { version = "0.1.1", default-features = false }
aya-log = { version = "0.2.1", default-features = false }
aya-log-ebpf = { version = "0.1.1", default-features = false }

anyhow = { version = "1", default-features = false }
# `std` feature is currently required to build `clap`.
#
# See https://github.com/clap-rs/clap/blob/61f5ee5/clap_builder/src/lib.rs#L15.
clap = { version = "4.1", default-features = false, features = ["std"] }
env_logger = { version = "0.10", default-features = false }
libc = { version = "0.2", default-features = false }
log = { version = "0.4", default-features = false }
tokio = { version = "1.25", default-features = false }
4 changes: 2 additions & 2 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1"
clap = { version = "4.1", features = ["derive"] }
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive"] }
2 changes: 1 addition & 1 deletion {{project-name}}-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ default = []
user = ["aya"]

[dependencies]
aya = { version = "0.13", optional = true }
aya = { workspace = true, optional = true }

[lib]
path = "src/lib.rs"
10 changes: 8 additions & 2 deletions {{project-name}}-ebpf/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# We have this so that one doesn't need to manually pass
# --target=bpfel-unknown-none -Z build-std=core when running cargo
# check/build/doc etc.
#
# NB: this file gets loaded only if you run cargo from this directory, it's
# ignored if you run from the workspace root. See
# https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure
[build]
target-dir = "../target"
target = "bpfel-unknown-none"
target = ["bpfeb-unknown-none", "bpfel-unknown-none"]

[unstable]
build-std = ["core"]
3 changes: 0 additions & 3 deletions {{project-name}}-ebpf/.cargo/rust-analyzer.toml

This file was deleted.

2 changes: 0 additions & 2 deletions {{project-name}}-ebpf/.helix/config.toml

This file was deleted.

5 changes: 3 additions & 2 deletions {{project-name}}-ebpf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aya-ebpf = "0.1.1"
aya-log-ebpf = "0.1.1"
{{ project-name }}-common = { path = "../{{ project-name }}-common" }

aya-ebpf = { workspace = true }
aya-log-ebpf = { workspace = true }

[[bin]]
name = "{{ project-name }}"
path = "src/main.rs"
Expand Down
11 changes: 0 additions & 11 deletions {{project-name}}-ebpf/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
[toolchain]
channel = "nightly"
# The source code of rustc, provided by the rust-src component, is needed for
# building eBPF programs.
components = [
"cargo",
"clippy",
"rust-docs",
"rust-src",
"rust-std",
"rustc",
"rustfmt",
]
20 changes: 11 additions & 9 deletions {{project-name}}/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ edition = "2021"
publish = false

[dependencies]
aya = "0.13"
aya-log = "0.2"
{{project-name}}-common = { path = "../{{project-name}}-common", features = ["user"] }

anyhow = { workspace = true }
aya = { workspace = true }
aya-log = { workspace = true }
env_logger = {workspace = true }
libc = { workspace = true }
log = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "net", "signal"] }

{% if program_types_with_opts contains program_type -%}
clap = { version = "4.1", features = ["derive"] }
clap = { workspace = true, features = ["derive"] }
{% endif -%}
{{project-name}}-common = { path = "../{{project-name}}-common", features = ["user"] }
anyhow = "1"
env_logger = "0.10"
libc = "0.2"
log = "0.4"
tokio = { version = "1.25", features = ["macros", "rt", "rt-multi-thread", "net", "signal"] }

[[bin]]
name = "{{project-name}}"
Expand Down

0 comments on commit c4cfd0b

Please sign in to comment.