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

companion for #10231 #4306

Merged
merged 8 commits into from
Dec 3, 2021
Merged

companion for #10231 #4306

merged 8 commits into from
Dec 3, 2021

Conversation

gui1117
Copy link
Contributor

@gui1117 gui1117 commented Nov 17, 2021 •
edited
Loading

just apply the renames for paritytech/substrate#10231
skip check-dependent-cumulus

@gui1117 gui1117 added B0-silent Changes should not be mentioned in any release notes A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. labels Nov 17, 2021
@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Nov 17, 2021
@gui1117 gui1117 mentioned this pull request Nov 17, 2021
Merged
@paritytech-processbot
Copy link

Error: Checks failed for bfccb97

@paritytech-processbot
Copy link

Companion update failed: CommandFailed { cmd: "Command { std: "cargo" "update" "-v" "-p" "pallet-gilt:4.0.0-dev" "-p" "sc-authority-discovery:0.10.0-dev" "-p" "sp-authorship:4.0.0-dev" "-p" "frame-election-provider-support:4.0.0-dev" "-p" "pallet-beefy:4.0.0-dev" "-p" "sc-consensus-uncles:0.10.0-dev" "-p" "sp-staking:4.0.0-dev" "-p" "substrate-prometheus-endpoint:0.10.0-dev" "-p" "sp-consensus-vrf:0.10.0-dev" "-p" "pallet-mmr:4.0.0-dev" "-p" "sp-database:4.0.0-dev" "-p" "sp-storage:4.0.0-dev" "-p" "sp-trie:4.0.0-dev" "-p" "pallet-elections-phragmen:5.0.0-dev" "-p" "sc-client-db:0.10.0-dev" "-p" "beefy-merkle-tree:4.0.0-dev" "-p" "frame-support-procedural-tools:4.0.0-dev" "-p" "sc-cli:0.10.0-dev" "-p" "sp-state-machine:0.10.0-dev" "-p" "frame-system-benchmarking:4.0.0-dev" "-p" "sc-rpc:4.0.0-dev" "-p" "sp-api:4.0.0-dev" "-p" "pallet-democracy:4.0.0-dev" "-p" "sp-std:4.0.0-dev" "-p" "sc-informant:0.10.0-dev" "-p" "substrate-test-utils:4.0.0-dev" "-p" "pallet-bags-list:4.0.0-dev" "-p" "pallet-authority-discovery:4.0.0-dev" "-p" "sp-finality-grandpa:4.0.0-dev" "-p" "sp-session:4.0.0-dev" "-p" "frame-system-rpc-runtime-api:4.0.0-dev" "-p" "sc-executor-wasmi:0.10.0-dev" "-p" "beefy-gadget-rpc:4.0.0-dev" "-p" "sc-telemetry:4.0.0-dev" "-p" "sp-version-proc-macro:4.0.0-dev" "-p" "sp-api-proc-macro:4.0.0-dev" "-p" "pallet-bounties:4.0.0-dev" "-p" "pallet-utility:4.0.0-dev" "-p" "sc-network-gossip:0.10.0-dev" "-p" "sp-core-hashing-proc-macro:4.0.0-dev" "-p" "sp-keyring:4.0.0-dev" "-p" "sp-panic-handler:4.0.0-dev" "-p" "sc-consensus-epochs:0.10.0-dev" "-p" "pallet-proxy:4.0.0-dev" "-p" "pallet-authorship:4.0.0-dev" "-p" "sp-authority-discovery:4.0.0-dev" "-p" "sp-npos-elections-solution-type:4.0.0-dev" "-p" "pallet-tips:4.0.0-dev" "-p" "sc-allocator:4.1.0-dev" "-p" "sp-externalities:0.10.0-dev" "-p" "sc-chain-spec:4.0.0-dev" "-p" "pallet-transaction-payment-rpc-runtime-api:4.0.0-dev" "-p" "sp-consensus-babe:0.10.0-dev" "-p" "pallet-nicks:4.0.0-dev" "-p" "pallet-session-benchmarking:4.0.0-dev" "-p" "beefy-gadget:4.0.0-dev" "-p" "sc-finality-grandpa-rpc:0.10.0-dev" "-p" "sc-peerset:4.0.0-dev" "-p" "sc-finality-grandpa:0.10.0-dev" "-p" "sp-keystore:0.10.0-dev" "-p" "pallet-sudo:4.0.0-dev" "-p" "sc-keystore:4.0.0-dev" "-p" "sc-executor-wasmtime:0.10.0-dev" "-p" "sc-sync-state-rpc:0.10.0-dev" "-p" "pallet-scheduler:4.0.0-dev" "-p" "sp-wasm-interface:4.0.0-dev" "-p" "sc-tracing-proc-macro:4.0.0-dev" "-p" "sc-rpc-server:4.0.0-dev" "-p" "pallet-mmr-rpc:3.0.0" "-p" "sp-core-hashing:4.0.0-dev" "-p" "sc-tracing:4.0.0-dev" "-p" "sc-proposer-metrics:0.10.0-dev" "-p" "frame-benchmarking-cli:4.0.0-dev" "-p" "sp-consensus:0.10.0-dev" "-p" "remote-externalities:0.10.0-dev" "-p" "pallet-treasury:4.0.0-dev" "-p" "pallet-transaction-payment:4.0.0-dev" "-p" "sp-arithmetic:4.0.0-dev" "-p" "substrate-wasm-builder:5.0.0-dev" "-p" "sp-runtime-interface:4.0.0-dev" "-p" "sp-transaction-pool:4.0.0-dev" "-p" "pallet-staking:4.0.0-dev" "-p" "sc-executor:0.10.0-dev" "-p" "pallet-babe:4.0.0-dev" "-p" "sc-transaction-pool:4.0.0-dev" "-p" "sp-consensus-slots:0.10.0-dev" "-p" "beefy-primitives:4.0.0-dev" "-p" "sp-debug-derive:4.0.0-dev" "-p" "test-runner:0.9.0" "-p" "fork-tree:3.0.0" "-p" "frame-benchmarking:4.0.0-dev" "-p" "pallet-offences:4.0.0-dev" "-p" "pallet-session:4.0.0-dev" "-p" "sc-basic-authorship:0.10.0-dev" "-p" "sc-transaction-pool-api:4.0.0-dev" "-p" "sc-utils:4.0.0-dev" "-p" "sp-blockchain:4.0.0-dev" "-p" "pallet-indices:4.0.0-dev" "-p" "pallet-vesting:4.0.0-dev" "-p" "sc-offchain:4.0.0-dev" "-p" "sp-transaction-storage-proof:4.0.0-dev" "-p" "sp-version:4.0.0-dev" "-p" "substrate-build-script-utils:3.0.0" "-p" "substrate-test-client:2.0.1" "-p" "pallet-grandpa:4.0.0-dev" "-p" "pallet-beefy-mmr:4.0.0-dev" "-p" "frame-support-test:3.0.0" "-p" "pallet-timestamp:4.0.0-dev" "-p" "pallet-membership:4.0.0-dev" "-p" "frame-try-runtime:0.10.0-dev" "-p" "frame-support:4.0.0-dev" "-p" "pallet-society:4.0.0-dev" "-p" "pallet-recovery:4.0.0-dev" "-p" "sc-consensus-babe-rpc:0.10.0-dev" "-p" "sp-block-builder:4.0.0-dev" "-p" "sp-inherents:4.0.0-dev" "-p" "pallet-bags-list-remote-tests:4.0.0-dev" "-p" "sp-maybe-compressed-blob:4.1.0-dev" "-p" "pallet-staking-reward-curve:4.0.0-dev" "-p" "sc-network:0.10.0-dev" "-p" "sp-offchain:4.0.0-dev" "-p" "substrate-test-utils-derive:0.10.0-dev" "-p" "pallet-mmr-primitives:4.0.0-dev" "-p" "try-runtime-cli:0.10.0-dev" "-p" "sc-executor-common:0.10.0-dev" "-p" "sp-timestamp:4.0.0-dev" "-p" "substrate-frame-rpc-system:4.0.0-dev" "-p" "sp-io:4.0.0-dev" "-p" "sc-state-db:0.10.0-dev" "-p" "frame-system:4.0.0-dev" "-p" "sc-client-api:4.0.0-dev" "-p" "pallet-assets:4.0.0-dev" "-p" "sp-npos-elections:4.0.0-dev" "-p" "pallet-im-online:4.0.0-dev" "-p" "sc-chain-spec-derive:4.0.0-dev" "-p" "sp-application-crypto:4.0.0-dev" "-p" "pallet-offences-benchmarking:4.0.0-dev" "-p" "sp-tasks:4.0.0-dev" "-p" "frame-executive:4.0.0-dev" "-p" "sc-consensus-babe:0.10.0-dev" "-p" "pallet-election-provider-multi-phase:4.0.0-dev" "-p" "sc-consensus-manual-seal:0.10.0-dev" "-p" "sp-tracing:4.0.0-dev" "-p" "sc-block-builder:0.10.0-dev" "-p" "sc-consensus:0.10.0-dev" "-p" "pallet-identity:4.0.0-dev" "-p" "sp-runtime:4.0.0-dev" "-p" "frame-support-procedural-tools-derive:3.0.0" "-p" "sc-service:0.10.0-dev" "-p" "sc-consensus-slots:0.10.0-dev" "-p" "pallet-staking-reward-fn:4.0.0-dev" "-p" "pallet-collective:4.0.0-dev" "-p" "sc-rpc-api:0.10.0-dev" "-p" "sp-rpc:4.0.0-dev" "-p" "frame-support-procedural:4.0.0-dev" "-p" "generate-bags:4.0.0-dev" "-p" "sp-core:4.0.0-dev" "-p" "sp-serializer:4.0.0-dev" "-p" "pallet-transaction-payment-rpc:4.0.0-dev" "-p" "pallet-multisig:4.0.0-dev" "-p" "frame-support-test-pallet:4.0.0-dev" "-p" "sp-runtime-interface-proc-macro:4.0.0-dev" "-p" "pallet-balances:4.0.0-dev", kill_on_drop: false }", status_code: Some(101), err: " Updating git repository https://github.com/paritytech/substrate\nerror: Unable to update https://github.com/paritytech/substrate?branch=master\n\nCaused by:\n failed to parse manifest at /usr/local/cargo/git/checkouts/substrate-7e08433d4c370a21/b6d489e/test-utils/test-crate/Cargo.toml\n\nCaused by:\n feature edition2021 is required\n\n The package requires the Cargo feature called edition2021, but that feature is not stabilized in this version of Cargo (1.55.0 (32da73ab1 2021-08-23)).\n Consider trying a newer version of Cargo (this may require the nightly release).\n See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#edition-2021 for more information about the status of this feature.\n" }

@gui1117
Copy link
Contributor Author

gui1117 commented Dec 3, 2021

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Head SHA changed from a7b4636 to eacda0f

@gui1117
Copy link
Contributor Author

gui1117 commented Dec 3, 2021

The change shouldn't change the runtime. As it only remove a feature which wasn't used. But I bump the spec version anyway to be safer.

@gui1117
Copy link
Contributor Author

gui1117 commented Dec 3, 2021

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Checks failed for 8bfc1d5

@gui1117
Copy link
Contributor Author

gui1117 commented Dec 3, 2021

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot paritytech-processbot bot merged commit 86b9d9b into master Dec 3, 2021
@paritytech-processbot paritytech-processbot bot deleted the gui-fix-bags-list branch December 3, 2021 07:00
ordian added a commit that referenced this pull request Dec 3, 2021
@ordian
Merge branch 'master' into bernhardAssure_backed_candidates_are_sor
51dd597 
* master: (23 commits)
  Fix path of the polkadot_injected docker image (#4463)
  update docs on `validation_upgrade_frequency` (#4460)
  Fix path of the polkadot sha256 (#4458)
  Fix cumulus companion CI job (#4451)
  Add doc about runtime version bump (#4418)
  Bump trybuild from 1.0.52 to 1.0.53 (#4455)
  companion for #10231 (#4306)
  trivial fix (#4441)
  Rococo: ability to programatically assign slots to teams (#3943)
  Add parent header hash to log (#4421)
  bump tx versions (#4447)
  Companion for substrate/10347 (#4413)
  Improve paras runtime `BenchBuilder` api (#4318)
  Add CI team to `CODEOWNERS` file (#4350)
  XCM Benchmarks for Generic Instructions (#3940)
  Announce only on releases (#4417)
  Companion for  10379 (EnsureOneOf) (#4405)
  add pallet-babe/std (#4438)
  update Cargo.lock
  Squashed 'bridges/' changes from 407bf44a8a..1602249f0a
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@emostov emostov emostov approved these changes

@kianenigma kianenigma kianenigma approved these changes

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gui1117 @kianenigma @emostov @shawntabrizi