Skip to content

Commit

Permalink
Merge branch 'master' into skunert/omni-node-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
skunert authored Dec 17, 2024
2 parents 8007fa7 + 31179c4 commit 96a1a76
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 43 deletions.
4 changes: 4 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ rustdocflags = [
CC_x86_64_unknown_linux_musl = { value = ".cargo/musl-gcc", force = true, relative = true }
CXX_x86_64_unknown_linux_musl = { value = ".cargo/musl-g++", force = true, relative = true }
CARGO_WORKSPACE_ROOT_DIR = { value = "", relative = true }

[net]
retry = 5
# git-fetch-with-cli = true # commented because there is a risk that a runner can be banned by github
118 changes: 77 additions & 41 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ multihash = { version = "0.19.1", default-features = false }
multihash-codetable = { version = "0.1.1" }
multistream-select = { version = "0.13.0" }
names = { version = "0.14.0", default-features = false }
nix = { version = "0.28.0" }
nix = { version = "0.29.0" }
node-cli = { path = "substrate/bin/node/cli", package = "staging-node-cli" }
node-inspect = { path = "substrate/bin/node/inspect", default-features = false, package = "staging-node-inspect" }
node-primitives = { path = "substrate/bin/node/primitives", default-features = false }
Expand Down Expand Up @@ -1123,7 +1123,7 @@ regex = { version = "1.10.2" }
relay-substrate-client = { path = "bridges/relays/client-substrate" }
relay-utils = { path = "bridges/relays/utils" }
remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" }
reqwest = { version = "0.11", default-features = false }
reqwest = { version = "0.12.9", default-features = false }
rlp = { version = "0.6.1", default-features = false }
rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" }
rococo-parachain-runtime = { path = "cumulus/parachains/runtimes/testing/rococo-parachain" }
Expand Down

0 comments on commit 96a1a76

Please sign in to comment.