Skip to content

Commit

Permalink
fix GH action
Browse files Browse the repository at this point in the history
  • Loading branch information
rob-maron committed Feb 14, 2024
1 parent 8b618d1 commit 4d5a8b5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

# run clippy for each feature flag configuration
- run: cargo clippy --features metrics
- run: cargo clippy --no-default-features
- run: cargo clippy --no-default-features --features runtime-async-std

- run: cargo test

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package.description = "The PushCDN is a distributed, scalable, and fault-toleran

[workspace.dependencies]
tokio = { version = "1.35.1", features = ["full"] }
async-std = { verison = "1.12.0", features = ["tokio1", "attributes"] }
jf-primitives.git = "https://github.com/EspressoSystems/jellyfish.git"
rand = "0.8.5"
tracing = "0.1.40"
Expand Down
7 changes: 5 additions & 2 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
description = "Defines client interactions for both marshals and brokers"

[features]
default = ["local_discovery", "insecure", "runtime-async-std"]
default = ["local_discovery", "insecure", "runtime-tokio"]

local_discovery = ["proto/local_discovery"]
insecure = ["proto/insecure"]
Expand All @@ -16,7 +16,10 @@ runtime-async-std = ["dep:async-std", "proto/runtime-async-std"]

[dependencies]
tokio = { workspace = true }
async-std = { workspace = true, optional = true }
async-std = { version = "1.12.0", features = [
"tokio1",
"attributes",
], optional = true }
jf-primitives.workspace = true
proto = { path = "../proto", default-features = false }
tracing-subscriber.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Contains the common protocol definition and common code for the b
capnpc = "0.19.0"

[features]
default = ["local_discovery", "insecure", "runtime-async-std"]
default = ["local_discovery", "insecure", "runtime-tokio"]

metrics = ["dep:prometheus", "dep:lazy_static"]
local_discovery = ["dep:sqlx"]
Expand All @@ -33,7 +33,7 @@ prometheus = { workspace = true, optional = true }
lazy_static = { workspace = true, optional = true }

tokio = { workspace = true }
async-std = { workspace = true, optional = true }
async-std = { version = "1.12.0", features = ["tokio1", "attributes"], optional = true }

capnp = "0.19.1"
thiserror = "1.0.56"
Expand Down

0 comments on commit 4d5a8b5

Please sign in to comment.