Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
26 changes: 19 additions & 7 deletions .config/zepter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version:
format: 1
# Minimum version of the binary that is expected to work. This is just for printing a nice error
# message when someone tries to use an older version.
binary: 1.78.0
binary: 1.82.1

# The examples in this file assume crate `A` to have a dependency on crate `B`.
workflows:
Expand All @@ -13,21 +13,33 @@ workflows:
'propagate-feature',
# These are the features to check:
'--features=try-runtime,runtime-benchmarks,std,bandersnatch-experimental',
# Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
# Do not try to add a new section into `[features]` of `A` only because `B` exposes that feature.
# There are edge-cases where this is still needed, but we can add them manually.
'--left-side-feature-missing=ignore',
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
# Ignore the case that `A` is outside of the workspace. Otherwise it will report errors
# in external dependencies that we have no influence on.
'--left-side-outside-workspace=ignore',
# Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
# Some features imply that they activate a specific dependency as non-optional.
# Otherwise the default behaviour with a `?` is used.
'--feature-enables-dep=try-runtime:frame-try-runtime,runtime-benchmarks:frame-benchmarking',
# Do not propagate std feature from sp-wasm-interface down to wasmtime dependency.
'--ignore-missing-propagate=sp-wasm-interface/std:wasmtime/std',
# Auxillary flags:
# Auxiliary flags:
'--offline',
'--locked',
'--show-path',
'--quiet',
]
# The umbrella crate uses more features, so we to check those too:
- [
'lint',
# Check that dependencies are not duplicated between normal and dev sections.
'duplicate-deps',
'--offline',
'--locked',
'--quiet',
]

# The umbrella crate uses more features, so we need to check those too:
check_umbrella:
- [ $check.0, '--features=serde,experimental,runtime,with-tracing,tuples-96,with-tracing', '-p=polkadot-sdk' ]
# Same as `check_*`, but with the `--fix` flag.
Expand All @@ -39,7 +51,7 @@ workflows:
help:
text: |
Polkadot-SDK uses the Zepter CLI to detect abnormalities in the feature configuration.
It looks like one more more checks failed; please check the console output. You can try to automatically address them by running `zepter`.
It looks like one or more checks failed; please check the console output. You can try to automatically address them by running `zepter`.
Otherwise please ask directly in the Merge Request, GitHub Discussions or on Matrix Chat, thank you.
links:
- "https://github.com/paritytech/polkadot-sdk/issues/1831"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/checks-quick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: |
cd substrate/
../.gitlab/ensure-deps.sh
check-rust-feature-propagation:
check-zepter:
runs-on: ubuntu-latest
timeout-minutes: 20
needs: [preflight]
Expand All @@ -62,7 +62,7 @@ jobs:
time cargo metadata --format-version=1 --locked > /dev/null
- name: Install newer Zepter
run: |
cargo install zepter@1.78.2 --locked -q
cargo install zepter@1.82.1 --locked -q
- name: run zepter
run: |
zepter --version
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
run: pip3 install "cargo-workspace>=1.2.4" toml
- name: Install newer Zepter
run: |
cargo install zepter@1.78.2 --locked -q && zepter --version
cargo install zepter@1.82.1 --locked -q && zepter --version
- name: check umbrella correctness
run: |
# Fixes "detected dubious ownership" error in the ci
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
needs:
- fmt
- check-dependency-rules
- check-rust-feature-propagation
- check-zepter
- test-rust-features
- check-toml-format
- check-workspace
Expand Down
1 change: 0 additions & 1 deletion substrate/bin/utils/chain-spec-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ sp-tracing = { workspace = true, default-features = true }

[dev-dependencies]
cmd_lib = { workspace = true }
docify = { workspace = true }
pretty_assertions = { workspace = true }
substrate-test-runtime = { workspace = true }

Expand Down
1 change: 0 additions & 1 deletion substrate/frame/staking-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ anyhow = { workspace = true }
env_logger = { workspace = true }
frame-benchmarking = { workspace = true, default-features = true }
frame-support = { features = ["experimental"], workspace = true, default-features = true }
log = { workspace = true }
pallet-bags-list = { workspace = true, default-features = true }
pallet-balances = { workspace = true, default-features = true }
rand_chacha = { workspace = true, default-features = true }
Expand Down
Loading