Skip to content

Commit dff960c

Browse files
committed
merge master and resolve conflicts
* master: (29 commits) Append overlay optimization. (#1223) finalization: Skip tree route calculation if no forks present (#4721) Remove unncessary call remove_from_peers_set (#4742) add pov-recovery unit tests and support for elastic scaling (#4733) approval-voting: Add no shows debug information (#4726) Revamp the Readme of the parachain template (#4713) Update README.md to move the PSVM link under a "Tooling" section under the "Releases" section (#4734) frame/proc-macro: Refactor code for better readability (#4712) Contracts: update wasmi to 0.32 (#3679) Backport style changes from P<>K bridge to R<>W bridge (#4732) New reference doc for Custom RPC V2 (#4654) Frame Pallets: Clean a lot of test setups (#4642) Fix occupied core handling (#4691) statement-distribution: Fix false warning (#4727) Update the README to include a link to the Polkadot SDK Version Manager (#4718) Cleanup PVF artifact by cache limit and stale time (#4662) Update link to a latest polkadot release (#4711) [CI] Delete cargo-deny config (#4677) fix build on MacOS: bump secp256k1 and secp256k1-sys to patched versions (#4709) Unify dependency aliases (#4633) ...
2 parents a22beac + ad86209 commit dff960c

File tree

600 files changed

+8241
-3992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+8241
-3992
lines changed

.gitlab/pipeline/check.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,6 @@ check-try-runtime:
2424
# experimental code may rely on try-runtime and vice-versa
2525
- time cargo check --locked --all --features try-runtime,experimental
2626

27-
# FIXME
28-
.cargo-deny-licenses:
29-
stage: check
30-
extends:
31-
- .docker-env
32-
- .test-pr-refs
33-
variables:
34-
CARGO_DENY_CMD: "cargo deny --all-features check licenses -c ./substrate/scripts/ci/deny.toml"
35-
script:
36-
- $CARGO_DENY_CMD --hide-inclusion-graph
37-
after_script:
38-
- echo "___The complete log is in the artifacts___"
39-
- $CARGO_DENY_CMD 2> deny.log
40-
- if [ $CI_JOB_STATUS != 'success' ]; then
41-
echo 'Please check license of your crate or add an exception to scripts/ci/deny.toml';
42-
fi
43-
allow_failure: true
44-
artifacts:
45-
name: $CI_COMMIT_SHORT_SHA
46-
expire_in: 3 days
47-
when: always
48-
paths:
49-
- deny.log
50-
5127
# from substrate
5228
# not sure if it's needed in monorepo
5329
check-dependency-rules:

0 commit comments

Comments
 (0)