Skip to content

Commit

Permalink
feat(cargo): consolidate versions and project organization (#35)
Browse files Browse the repository at this point in the history
* feat(cargo): consolidate versions and project organization

* Update bazel lock
  • Loading branch information
sasa-tomic committed Jan 8, 2024
1 parent b22c357 commit dbf0cc3
Show file tree
Hide file tree
Showing 11 changed files with 348 additions and 309 deletions.
462 changes: 231 additions & 231 deletions Cargo.Bazel.lock

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions Cargo.lock

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

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ members = [

resolver = "2"

[workspace.package]
version = "0.1.0"
edition = "2021"
authors = ["IC Decentralized Reliability Engineering (DRE) Team"]
description = "Tooling for managing the Internet Computer"
documentation = "https://github.com/dfinity/dre/"

[profile.release]
# Add debug information to the release build (does NOT reduce the level of optimization!)
# Makes flamegraphs and backtraces more readable.
Expand Down
14 changes: 10 additions & 4 deletions rs/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[package]
name = "release_cli"
version = "0.1.0"
edition = "2021"
name = "dre"
build = "build.rs"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -60,7 +63,10 @@ sha2 = "0.10.6"
edit = "0.1.4"
tabular = "0.2"
ic-agent = "0.27.0"
actix-web = { version = "4.2.1", default-features = false, features = ["compress-gzip", "macros"] }
actix-web = { version = "4.2.1", default-features = false, features = [
"compress-gzip",
"macros",
] }
dotenv = "0.15.0"
socket2 = "0.5.4"
spinners = "4.1.0"
Expand Down
7 changes: 5 additions & 2 deletions rs/decentralization/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "decentralization"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
7 changes: 5 additions & 2 deletions rs/ic-canisters/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "ic-canisters"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

[dependencies]
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "4b3b2ce76c4bde0c1c60fb80b0915931003b7eca" }
Expand Down
7 changes: 5 additions & 2 deletions rs/ic-management-backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "ic-management-backend"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

[dependencies]
tokio = { version = "1.2.0", features = ["full"] }
Expand Down
7 changes: 5 additions & 2 deletions rs/ic-management-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "ic-management-types"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

[dependencies]
actix-web = { version = "4.2.1", default-features = false, features = [
Expand Down
9 changes: 6 additions & 3 deletions rs/log-fetcher/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "log-fetcher"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -25,4 +28,4 @@ pretty_env_logger = "0.5.0"
tokio = { version = "1.14.0", features = ["full"] }
anyhow = "1.0.44"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.108"
serde_json = "1.0.108"
20 changes: 14 additions & 6 deletions rs/np-notifications/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "np-notifications"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -26,16 +29,21 @@ serde_yaml = "0.9.25"
rand = "0.8.5"
tracing = { version = "0.1.37", features = ["log"] }
tracing-subscriber = "0.3.17"
tracing-log = { version= "0.2.0", features = ["log-tracer"] }
tracing-log = { version = "0.2.0", features = ["log-tracer"] }
anyhow = "1.0.75"

[dev-dependencies]
tempfile = "3.8.0"
pretty_assertions = "1.4.0"
httptest = "0.15.4"
# Default features disabled because it would require env_logger, and we are not using it
test-log = { version = "0.2.12", default-features = false, features = ["trace"] }
test-log = { version = "0.2.12", default-features = false, features = [
"trace",
] }
# Necessary for test-log
# https://crates.io/crates/test-log
tracing = {version = "0.1", default-features = false}
tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]}
tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false, features = [
"env-filter",
"fmt",
] }
7 changes: 5 additions & 2 deletions rs/slack-notifications/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "slack-notifications"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description.workspace = true
documentation.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down

0 comments on commit dbf0cc3

Please sign in to comment.