Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #535 #553

Merged
merged 11 commits into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# TODO: https://github.com/ComposableFi/composable/issues/535
/home/runner/.cargo/bin/cargo install -f cargo-llvm-cov
/home/runner/.cargo/bin/rustup component add llvm-tools-preview --toolchain=nightly-2021-11-08
SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-08 llvm-cov --workspace --locked --release --verbose --features=runtime-benchmarks --exclude=integration-tests --lcov --output-path lcov.info
SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-08 llvm-cov --workspace --locked --release --verbose --features=runtime-benchmarks --lcov --output-path lcov.info
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- uses: actions/checkout@v2
- name: Run Test
run: |
SKIP_WASM_BUILD=1 cargo test --workspace --locked --release --verbose --features=runtime-benchmarks --exclude=integration-tests
SKIP_WASM_BUILD=1 cargo test --workspace --locked --release --verbose --features=runtime-benchmarks

linters:
name: Linters
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/simnode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
docker system prune --force --all --volumes

- uses: actions/checkout@v2
with:
ref: main

- name: Check for runtime changes
id: check_runtime
Expand Down
117 changes: 114 additions & 3 deletions Cargo.lock

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

21 changes: 14 additions & 7 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0

# added on top of runtime for emulation of network
paste = "1.0.5"
polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-emulator = { git = "https://github.com/dzmitry-lahoda-forks/xcm-simulator", branch = "dz/0.9.13", default-features = false }
kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
picasso-runtime = { package = "dali-runtime", path = "../runtime/dali", default-features = false }

[dev-dependencies]
Expand All @@ -125,9 +125,9 @@ std = [
"sp-block-builder/std",
"sp-transaction-pool/std",
"sp-inherents/std",
"support/std",
"support/std",
"executive/std",
"frame-system/std",
"frame-system/std",
"utility/std",
"authorship/std",
"balances/std",
Expand Down Expand Up @@ -163,7 +163,11 @@ std = [
"xcm-executor/std",
"aura/std",
"sp-consensus-aura/std",
"scale-info/std",
"scale-info/std",
"kusama-runtime/std",
"polkadot-core-primitives/std",
"polkadot-primitives/std",
"polkadot-runtime-parachains/std",
]

runtime-benchmarks = [
Expand All @@ -189,6 +193,9 @@ runtime-benchmarks = [
"democracy/runtime-benchmarks",
"utility/runtime-benchmarks",
"kusama-runtime/runtime-benchmarks",
"picasso-runtime/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
]

develop = [
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ hex = "0.4.3"

[features]
default = []
runtime-benchmarks = ["picasso-runtime/runtime-benchmarks", "composable-runtime/runtime-benchmarks", "dali-runtime/runtime-benchmarks"]
runtime-benchmarks = ["polkadot-service/runtime-benchmarks", "picasso-runtime/runtime-benchmarks", "composable-runtime/runtime-benchmarks", "dali-runtime/runtime-benchmarks"]
ocw = []
dali = ["dali-runtime"]
composable = ["composable-runtime"]
Expand Down