Skip to content

Commit 68183e9

Browse files
committed
Merge branch 'master' of github.com:paritytech/polkadot-sdk into liam/initialise-storage-version
2 parents 6a66617 + 5adcb3e commit 68183e9

File tree

601 files changed

+14165
-48543
lines changed

Some content is hidden

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

601 files changed

+14165
-48543
lines changed

.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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@ build-linux-stable:
1919
RUN_UI_TESTS: 1
2020
script:
2121
- time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot --bin polkadot-prepare-worker --bin polkadot-execute-worker
22+
- time ROCOCO_EPOCH_DURATION=10 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-10/
23+
- time ROCOCO_EPOCH_DURATION=100 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-100/
24+
- time ROCOCO_EPOCH_DURATION=600 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-600/
25+
- pwd
26+
- ls -alR runtimes
2227
# pack artifacts
2328
- mkdir -p ./artifacts
2429
- VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
2530
- mv ./target/testnet/polkadot ./artifacts/.
2631
- mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
2732
- mv ./target/testnet/polkadot-execute-worker ./artifacts/.
33+
- mv ./runtimes/ ./artifacts/.
2834
- pushd artifacts
2935
- sha256sum polkadot | tee polkadot.sha256
3036
- shasum -c polkadot.sha256

.gitlab/pipeline/check.yml

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,16 @@ test-rust-feature-propagation:
113113
script:
114114
- |
115115
export RUST_LOG=remote-ext=debug,runtime=debug
116-
echo "---------- Running try-runtime for ${NETWORK} ----------"
117-
time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --rev a93c9b5abe5d31a4cf1936204f7e5c489184b521
118-
time cargo build --release --locked -p "$NETWORK"-runtime --features try-runtime
116+
echo "---------- Installing try-runtime-cli ----------"
117+
time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --tag v0.3.0
118+
echo "---------- Building ${PACKAGE} runtime ----------"
119+
time cargo build --release --locked -p "$PACKAGE" --features try-runtime
120+
echo "---------- Executing `on-runtime-upgrade` for ${NETWORK} ----------"
119121
time try-runtime \
120-
--runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \
121-
on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443
122+
--runtime ./target/release/wbuild/"$PACKAGE"/"$WASM" \
123+
on-runtime-upgrade --checks=pre-and-post ${EXTRA_ARGS} live --uri ${URI}
122124
125+
# Check runtime migrations for Parity managed relay chains
123126
check-runtime-migration-westend:
124127
stage: check
125128
extends:
@@ -128,19 +131,61 @@ check-runtime-migration-westend:
128131
- .check-runtime-migration
129132
variables:
130133
NETWORK: "westend"
134+
PACKAGE: "westend-runtime"
135+
WASM: "westend_runtime.compact.compressed.wasm"
136+
URI: "wss://westend-try-runtime-node.parity-chains.parity.io:443"
137+
EXTRA_ARGS: "--no-weight-warnings"
131138

132139
check-runtime-migration-rococo:
133140
stage: check
134-
# DAG
135-
needs:
136-
- job: check-runtime-migration-westend
137-
artifacts: false
138141
extends:
139142
- .docker-env
140143
- .test-pr-refs
141144
- .check-runtime-migration
142145
variables:
143146
NETWORK: "rococo"
147+
PACKAGE: "rococo-runtime"
148+
WASM: "rococo_runtime.compact.compressed.wasm"
149+
URI: "wss://rococo-try-runtime-node.parity-chains.parity.io:443"
150+
EXTRA_ARGS: "--no-weight-warnings"
151+
152+
# Check runtime migrations for Parity managed asset hub chains
153+
check-runtime-migration-asset-hub-westend:
154+
stage: check
155+
extends:
156+
- .docker-env
157+
- .test-pr-refs
158+
- .check-runtime-migration
159+
variables:
160+
NETWORK: "asset-hub-westend"
161+
PACKAGE: "asset-hub-westend-runtime"
162+
WASM: "asset_hub_westend_runtime.compact.compressed.wasm"
163+
URI: "wss://westend-asset-hub-rpc.polkadot.io:443"
164+
165+
check-runtime-migration-bridge-hub-rococo:
166+
stage: check
167+
extends:
168+
- .docker-env
169+
- .test-pr-refs
170+
- .check-runtime-migration
171+
variables:
172+
NETWORK: "bridge-hub-rococo"
173+
PACKAGE: "bridge-hub-rococo-runtime"
174+
WASM: "bridge_hub_rococo_runtime.compact.compressed.wasm"
175+
URI: "wss://rococo-bridge-hub-rpc.polkadot.io:443"
176+
177+
# Check runtime migrations for Parity managed contract chains
178+
check-runtime-migration-contracts-rococo:
179+
stage: check
180+
extends:
181+
- .docker-env
182+
- .test-pr-refs
183+
- .check-runtime-migration
184+
variables:
185+
NETWORK: "contracts-rococo"
186+
PACKAGE: "contracts-rococo-runtime"
187+
WASM: "contracts_rococo_runtime.compact.compressed.wasm"
188+
URI: "wss://rococo-contracts-rpc.polkadot.io:443"
144189

145190
find-fail-ci-phrase:
146191
stage: check

.gitlab/pipeline/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ test-deterministic-wasm:
229229
artifacts: false
230230
script:
231231
# build runtime
232-
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p staging-kusama-runtime -p polkadot-runtime -p westend-runtime
232+
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
233233
# make checksum
234234
- sha256sum target/release/wbuild/*-runtime/target/wasm32-unknown-unknown/release/*.wasm > checksum.sha256
235235
- cargo clean
236236
# build again
237-
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p staging-kusama-runtime -p polkadot-runtime -p westend-runtime
237+
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
238238
# confirm checksum
239239
- sha256sum -c checksum.sha256
240240

0 commit comments

Comments
 (0)