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

Companion PR for substrate#6676#1427

Merged
4 commits merged intomasterfrom
tka-companion-6676
Jul 21, 2020
Merged

Companion PR for substrate#6676#1427
4 commits merged intomasterfrom
tka-companion-6676

Conversation

@tomaka
Copy link
Contributor

@tomaka tomaka commented Jul 17, 2020

@tomaka tomaka added A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). 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. labels Jul 17, 2020
@tomaka tomaka mentioned this pull request Jul 17, 2020
Merged
@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Jul 17, 2020
cheme
cheme approved these changes Jul 17, 2020
View reviewed changes
Copy link
Contributor

@cheme cheme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (ed25519 is imported from dalek to get signature traits it seems)

@tomaka tomaka added the A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. label Jul 17, 2020
@ghost
Copy link

ghost commented Jul 20, 2020

Waiting for commit status.

@tomaka tomaka closed this Jul 20, 2020
@tomaka
Copy link
Contributor Author

tomaka commented Jul 20, 2020

I've just closed this to prevent the bot from merging it, in order to not update Substrate right before 0.8.16.
If you update Substrate in Polkadot, the one change that is needed for it to compile is to also do cargo update -p libp2p-core.

@sjeohp-zz
Copy link

sjeohp-zz commented Jul 20, 2020

You can also bot merge cancel FYI

@tomaka tomaka reopened this Jul 20, 2020
@tomaka
Copy link
Contributor Author

tomaka commented Jul 20, 2020

bot merge cancel

@ghost
Copy link

ghost commented Jul 20, 2020

Merge cancelled.

@tomaka tomaka mentioned this pull request Jul 20, 2020
Merged
@tomaka
Copy link
Contributor Author

tomaka commented Jul 21, 2020 •
edited
Loading

As long as this PR isn't merged, all the Polkadot companion CI checks in Substrate fail.

But I've just realized that the Substrate bump that this PR does only brings two insubstantial commits: paritytech/substrate@26a64d2 and paritytech/substrate@5c43b2b.

Therefore it's probably ok to merge this.

@tomaka
Copy link
Contributor Author

tomaka commented Jul 21, 2020

bot merge

@ghost
Copy link

ghost commented Jul 21, 2020

Trying merge.

@ghost ghost merged commit 1c606b1 into master Jul 21, 2020
@ghost ghost deleted the tka-companion-6676 branch July 21, 2020 07:27
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@cheme cheme cheme approved these changes

@bkchr bkchr bkchr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tomaka @sjeohp-zz @cheme @bkchr