Skip to content

Commit

Permalink
build-sys: Switch to workspace dependencies
Browse files Browse the repository at this point in the history
Prep for addding another crate, where I want to avoid
duplicating all the versions again.

Signed-off-by: Colin Walters <[email protected]>
  • Loading branch information
cgwalters committed Jul 16, 2024
1 parent c866bba commit 046003f
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 27 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ codegen-units = 1
inherits = "release"
lto = "yes"

[workspace.dependencies]
anyhow = "1.0.82"
camino = "1.1.6"
cap-std-ext = "4"
clap = "4.5.4"
fn-error-context = "0.2.1"
libc = "0.2.154"
serde = "1.0.199"
serde_json = "1.0.116"
tempfile = "3.10.1"
tracing = "0.1.40"
tokio = ">= 1.37.0"

# See https://github.com/coreos/cargo-vendor-filterer
[workspace.metadata.vendor-filter]
# For now we only care about tier 1+2 Linux. (In practice, it's unlikely there is a tier3-only Linux dependency)
Expand Down
9 changes: 4 additions & 5 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ default-run = "bootc"
platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "riscv64gc-unknown-linux-gnu"]

[dependencies]
anyhow = "1.0.82"
anyhow = { workspace = true }
bootc-lib = { version = "0.1", path = "../lib" }
clap = "4.5.4"
libc = "0.2.154"
tokio = { version = "1.37.0", features = ["macros"] }
clap = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
log = "0.4.21"
tracing = "0.1.40"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
22 changes: 11 additions & 11 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
[dependencies]
anstream = "0.6.13"
anstyle = "1.0.6"
anyhow = "1.0.82"
camino = { version = "1.1.6", features = ["serde1"] }
anyhow = { workspace = true }
camino = { workspace = true, features = ["serde1"] }
ostree-ext = { version = "0.14.0" }
chrono = { version = "0.4.38", features = ["serde"] }
clap = { version= "4.5.4", features = ["derive","cargo"] }
clap = { workspace = true, features = ["derive","cargo"] }
clap_mangen = { version = "0.2.20", optional = true }
cap-std-ext = "4"
cap-std-ext = { workspace = true }
hex = "^0.4.3"
fn-error-context = "0.2.1"
fn-error-context = { workspace = true }
gvariant = "0.5.0"
indicatif = "0.17.8"
libc = "^0.2.154"
libc = { workspace = true }
liboverdrop = "0.1.0"
libsystemd = "0.7"
openssl = "^0.10.64"
Expand All @@ -34,14 +34,14 @@ nix = { version = "0.29", features = ["ioctl", "sched" ] }
regex = "1.10.4"
rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process"] }
schemars = { version = "0.8.17", features = ["chrono"] }
serde = { features = ["derive"], version = "1.0.199" }
serde = { workspace = true, features = ["derive"] }
serde_ignored = "0.1.10"
serde_json = "1.0.116"
serde_json = { workspace = true }
serde_yaml = "0.9.34"
tokio = { features = ["io-std", "time", "process", "rt", "net"], version = ">= 1.37.0" }
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
tokio-util = { features = ["io-util"], version = "0.7.10" }
tracing = "0.1.40"
tempfile = "3.10.1"
tracing = { workspace = true }
tempfile = { workspace = true }
toml = "0.8.12"
xshell = { version = "0.2.6", optional = true }
uuid = { version = "1.8.0", features = ["v4"] }
Expand Down
14 changes: 7 additions & 7 deletions tests-integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ name = "tests-integration"
path = "src/tests-integration.rs"

[dependencies]
anyhow = "1.0.82"
camino = "1.1.6"
cap-std-ext = "4"
clap = { version= "4.5.4", features = ["derive","cargo"] }
fn-error-context = "0.2.1"
anyhow = { workspace = true }
camino = { workspace = true }
cap-std-ext = { workspace = true }
clap = { workspace = true, features = ["derive","cargo"] }
fn-error-context = { workspace = true }
indoc = "2.0.5"
libtest-mimic = "0.7.3"
oci-spec = "0.6.5"
rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process"] }
serde = { features = ["derive"], version = "1.0.199" }
serde_json = "1.0.116"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tempfile = "3.10.1"
xshell = { version = "0.2.6" }
6 changes: 3 additions & 3 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ name = "xtask"
path = "src/xtask.rs"

[dependencies]
anyhow = "1.0.82"
camino = "1.1.6"
anyhow = { workspace = true }
camino = { workspace = true }
chrono = { version = "0.4.38", default-features = false, features = ["std"] }
fn-error-context = "0.2.1"
fn-error-context = { workspace = true }
tempfile = "3.10.1"
mandown = "0.1.3"
xshell = { version = "0.2.6" }

0 comments on commit 046003f

Please sign in to comment.