Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 2e3f919

Browse files
author
parity-processbot
committed
Merge remote-tracking branch 'origin/master' into ankan/12041-staking-migration-versioning
2 parents c2f3cbc + 52e96b3 commit 2e3f919

File tree

209 files changed

+17391
-3165
lines changed

Some content is hidden

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

209 files changed

+17391
-3165
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ default:
213213
# this job runs only on nightly pipeline with the mentioned variable, against `master` branch
214214
- if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
215215

216+
.scheduled-crate-publishing-pipeline:
217+
rules:
218+
- if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "automatic-crate-publishing"
219+
216220
.crates-publishing-template:
217221
stage: test
218222
extends: .docker-env

Cargo.lock

Lines changed: 105 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ members = [
122122
"frame/preimage",
123123
"frame/proxy",
124124
"frame/message-queue",
125+
"frame/nfts",
125126
"frame/nomination-pools",
126127
"frame/nomination-pools/fuzzer",
127128
"frame/nomination-pools/benchmarking",

bin/node/bench/src/construct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl core::Benchmark for ConstructionBenchmark {
143143
proposer_factory.init(
144144
&context
145145
.client
146-
.header(&BlockId::number(0))
146+
.header(context.client.chain_info().genesis_hash)
147147
.expect("Database error querying block #0")
148148
.expect("Block #0 should exist"),
149149
),

0 commit comments

Comments
 (0)