Skip to content

Commit

Permalink
fix(ci): Release plz (#145)
Browse files Browse the repository at this point in the history
I *think* this should fix release plz. Tried to add a check before PRs,
but wasn't working. This removes a possible dependency clash based off
of multiple declarations of `alloy-consensus`.

Update lockfile
  • Loading branch information
clabby authored Apr 26, 2024
1 parent e950aa3 commit 2caf119
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"
[workspace.package]
edition = "2021"
license = "MIT"
authors = ["clabby"]
authors = ["clabby", "refcell"]
repository = "https://github.com/ethereum-optimism/kona"
homepage = "https://github.com/ethereum-optimism/kona"
exclude = ["**/target", "benches/", "tests"]
Expand All @@ -17,6 +17,7 @@ tracing = { version = "0.1.40", default-features = false }
cfg-if = "1.0.0"
alloy-primitives = { version = "0.7.1", default-features = false }
alloy-rlp = { version = "0.3.4", default-features = false }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false }

[profile.dev]
opt-level = 1
Expand Down
2 changes: 1 addition & 1 deletion crates/derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ homepage.workspace = true
# Workspace
anyhow.workspace = true
tracing.workspace = true
alloy-consensus.workspace = true
alloy-primitives = { workspace = true, features = ["rlp"] }
alloy-rlp = { workspace = true, features = ["derive"] }

Expand All @@ -20,7 +21,6 @@ kona-primitives = { path = "../primitives", version = "0.0.1" }

# External
alloy-sol-types = { version = "0.7.1", default-features = false }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false }
op-alloy-consensus = { git = "https://github.com/clabby/op-alloy", branch = "refcell/consensus-port", default-features = false }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false }
async-trait = "0.1.77"
Expand Down
2 changes: 1 addition & 1 deletion crates/mpt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ alloy-rlp = { workspace = true, default-features = false }
alloy-trie = { version = "0.3.1", default-features = false }

[dev-dependencies]
alloy-consensus.workspace = true
tokio = { version = "1.36.0", features = ["full"] }
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07" }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07" }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07" }
reqwest = "0.12"
tracing-subscriber = "0.3.18"
2 changes: 1 addition & 1 deletion crates/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ homepage.workspace = true

[dependencies]
anyhow.workspace = true
alloy-consensus.workspace = true
alloy-rlp = { workspace = true, features = ["derive"] }
alloy-primitives = { workspace = true, features = ["rlp"] }

# Alloy Types
alloy-sol-types = { version = "0.7.1", default-features = false }
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false }
op-alloy-consensus = { git = "https://github.com/clabby/op-alloy", branch = "refcell/consensus-port", default-features = false }

# `serde` feature dependencies
Expand Down

0 comments on commit 2caf119

Please sign in to comment.