Skip to content

Commit e333fa8

Browse files
committed
Merge branch 'master' into ao-disabling-statement-distribution
* master: (33 commits) ci: set CI_IMAGE back to (now updated) .ci-unified (#1854) ci: bump ci image to rust 1.73.0 (#1830) Refactor Identity to benchmark v2 (#1838) PVF worker: bump landlock, update ABI docs (#1850) Xcm emulator nits (#1649) Fixes path issue in derive-impl (#1823) upgrade to macro_magic 0.4.3 (#1832) Use safe math when pruning statuses (#1835) remote-ext: fix state download stall on slow connections and reduce memory usage (#1295) Update testnet bootnode dns name (#1712) [FRAME] Warn on unchecked weight witness (#1818) [xcm] Use `Weight::MAX` for `reserve_asset_deposited`, `receive_teleported_asset` benchmarks (#1726) Update bridges subtree (#1803) Check for parent of first ready block being on chain (#1812) Make CheckNonce refuse transactions signed by accounts with no providers (#1578) Fix Asset Hub collator crashing when starting from genesis (#1788) Mixnet integration (#1346) [xcm-emulator] Decouple the `AccountId` type from `AccountId32` (#1458) Treasury spends various asset kinds (#1333) chore: bump zombienter version (#1806) ...
2 parents 9f6736d + b5aee6e commit e333fa8

File tree

319 files changed

+9339
-5652
lines changed

Some content is hidden

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

319 files changed

+9339
-5652
lines changed

.cargo/config.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#
1+
[build]
2+
rustdocflags = [
3+
"-Dwarnings",
4+
"-Arustdoc::redundant_explicit_links", # stylistic
5+
]
6+
27
# An auto defined `clippy` feature was introduced,
38
# but it was found to clash with user defined features,
49
# so was renamed to `cargo-clippy`.
@@ -30,4 +35,5 @@ rustflags = [
3035
"-Aclippy::derivable_impls", # false positives
3136
"-Aclippy::stable_sort_primitive", # prefer stable sort
3237
"-Aclippy::extra-unused-type-parameters", # stylistic
38+
"-Aclippy::default_constructed_unit_structs", # stylistic
3339
]

.github/review-bot.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rules:
1010
- ^\.cargo/.*
1111
exclude:
1212
- ^./gitlab/pipeline/zombienet.*
13-
min_approvals: 2
13+
minApprovals: 2
1414
type: basic
1515
teams:
1616
- ci
@@ -27,7 +27,7 @@ rules:
2727
exclude:
2828
- ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
2929
- ^substrate\/frame\/.+\.md$
30-
min_approvals: 1
30+
minApprovals: 1
3131
allowedToSkipRule:
3232
teams:
3333
- core-devs
@@ -54,7 +54,7 @@ rules:
5454
- ^\.gitlab/.*
5555
- ^\.config/nextest.toml
5656
- ^\.cargo/.*
57-
min_approvals: 2
57+
minApprovals: 2
5858
type: basic
5959
teams:
6060
- core-devs
@@ -70,10 +70,10 @@ rules:
7070
- ^cumulus/parachains/common/src/[^/]+\.rs$
7171
type: and-distinct
7272
reviewers:
73-
- min_approvals: 1
73+
- minApprovals: 1
7474
teams:
7575
- locks-review
76-
- min_approvals: 1
76+
- minApprovals: 1
7777
teams:
7878
- polkadot-review
7979

@@ -83,7 +83,7 @@ rules:
8383
condition:
8484
include:
8585
- ^bridges/.*
86-
min_approvals: 1
86+
minApprovals: 1
8787
teams:
8888
- bridges-core
8989

@@ -95,10 +95,10 @@ rules:
9595
- ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
9696
type: "and"
9797
reviewers:
98-
- min_approvals: 2
98+
- minApprovals: 2
9999
teams:
100100
- core-devs
101-
- min_approvals: 1
101+
- minApprovals: 1
102102
teams:
103103
- frame-coders
104104

@@ -107,15 +107,14 @@ rules:
107107
condition:
108108
include:
109109
- review-bot\.yml
110-
min_approvals: 2
111110
type: "and"
112111
reviewers:
113-
- min_approvals: 1
112+
- minApprovals: 1
114113
teams:
115114
- opstooling
116-
- min_approvals: 1
115+
- minApprovals: 1
117116
teams:
118117
- locks-review
119-
- min_approvals: 1
118+
- minApprovals: 1
120119
teams:
121120
- ci

.github/workflows/review-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
app_id: ${{ secrets.REVIEW_APP_ID }}
2525
private_key: ${{ secrets.REVIEW_APP_KEY }}
2626
- name: "Evaluates PR reviews and assigns reviewers"
27-
uses: paritytech/review-bot@v1.1.0
27+
uses: paritytech/review-bot@v2.0.1
2828
with:
2929
repo-token: ${{ secrets.GITHUB_TOKEN }}
3030
team-token: ${{ steps.team_token.outputs.token }}

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
3131
NEXTEST_FAILURE_OUTPUT: immediate-final
3232
NEXTEST_SUCCESS_OUTPUT: final
33-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.68"
33+
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.69"
3434
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
3535

3636
default:

.gitlab/pipeline/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ build-rustdoc:
9191
- .run-immediately
9292
variables:
9393
SKIP_WASM_BUILD: 1
94+
RUSTDOCFLAGS: ""
9495
artifacts:
9596
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
9697
when: on_success
@@ -99,7 +100,6 @@ build-rustdoc:
99100
- ./crate-docs/
100101
script:
101102
# FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
102-
# FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
103103
- time cargo doc --features try-runtime,experimental --workspace --no-deps
104104
- rm -f ./target/doc/.lock
105105
- mv ./target/doc ./crate-docs

.gitlab/pipeline/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ test-rustdoc:
181181
- .run-immediately
182182
variables:
183183
SKIP_WASM_BUILD: 1
184-
RUSTDOCFLAGS: "-Dwarnings"
185184
script:
186185
- time cargo doc --workspace --all-features --no-deps
187186
allow_failure: true

0 commit comments

Comments
 (0)