-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You shouldn't change Cargo.toml
s (other than renaming the beefy crates) - aka it should still point to git = "https://github.com/paritytech/substrate", branch = "master"
The companion system will do the rest of the magic:
- it will
cargo patch
substrate to the right PR branch for the CI - once the PR is merged, it will update substrate references here to the right commit hash in
paritytech/substrate/master
@acatangiu I know. Indeed is marked as DO NOT MERGE. This is a trick to allow to have a successful pipeline when you rename some crates already in the lock file of polkadot. This will be reverted just before merge (I already used this trick for GRANDPA crates renaming in a prev PR) In short the steps that I've used is:
AFAIK this currently is the only way to do this since diener doesn't support this (yet) |
@@ -35,6 +34,7 @@ telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/sub | |||
# Substrate Primitives | |||
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } | |||
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" } | |||
beefy-primitives = { package = "sp-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "master" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
beefy-primitives = { package = "sp-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "master" } | |
sp-consensus-beefy = { package = "sp-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "master" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. you are absolutely right! And I really would :-)
But then if I follow my instinct I have to rename all this stuff as well:
- beefy-primitives -> sp-consensus-beefy
- grandpa-primitives -> sp-consensus-grandpa
- beefy -> sc-consensus-beefy
- grandpa -> sc-consensus-grandpa
- babe -> sc-consensus-babe
(for the coherence reason 😃)
So probably I would merge this first, just to let polkadot to compile with current substrate master.
Then I can do that in a follow up PR
Companion for paritytech/substrate#13484