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

Companion for Substrate#11107 #5197

Merged
merged 19 commits into from
Mar 24, 2022
Merged

Companion for Substrate#11107 #5197

merged 19 commits into from
Mar 24, 2022

Conversation

koute
Copy link
Contributor

@koute koute commented Mar 24, 2022 •
edited by KiChjang
Loading

Companion for paritytech/substrate#11107

Fixes #5190
Closes #4862

cumulus companion: paritytech/cumulus#1089

@koute koute added I3-bug Fails to follow expected behavior. A0-please_review Pull request needs code review. 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 Mar 24, 2022
@koute koute mentioned this pull request Mar 24, 2022
Merged
@KiChjang
Copy link
Contributor

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Checks failed for 3c58cae

@davxy
Copy link
Member

davxy commented Mar 24, 2022 •
edited
Loading

@KiChjang this fails because this companion failed to merge.

And that failed because this is not merged :-)

So, to unlock the situation I think that first we should merge your pending companion, then mine, then this

@KiChjang
Copy link
Contributor

@davxy The best way is to roll every companion into one PR and have it merged, as what @bkchr suggested, because your companion is still going to fail without this PR merged.

@KiChjang
Copy link
Contributor

bot merge

@davxy
Copy link
Member

davxy commented Mar 24, 2022 •
edited
Loading

@davxy The best way is to roll every companion into one PR and have it merged, as what @bkchr suggested, because your companion is still going to fail without this PR merged.

@KiChjang
Ok. I close my PR for Polkadot then. Now, what about cumulus? My PR was having a companion for cumulus as well paritytech/cumulus#1089

@KiChjang
Copy link
Contributor

@davxy In that case, we'll just put it in the description of this PR.

@KiChjang
Copy link
Contributor

bot merge

@shawntabrizi
Copy link
Member

Gonna handle the rest of the errors manually

@shawntabrizi shawntabrizi merged commit 827792c into paritytech:master Mar 24, 2022
ordian added a commit that referenced this pull request Mar 24, 2022
@ordian
Merge branch 'master' into ao-remove-old-migrations
b323434 
* master:
  Try to fix out of view statements (#5177)
  Companion for Substrate#11107 (#5197)
  paras: `include_pvf_check_statement` rt bench (#4938)
  [ci] Run short benchmarks only in PR pipelines (#5200)
  Companion for paritytech/substrate#10242 (#4862)
  [ci] Add short benchmarks to the pipeline (#5188)
  upgrade coarsetime to 0.1.22 to fix a potential panic (#5193)
  Update docs and enable DOT-over-XCM (#4809)
  enable disputes on all chains (#5182)
  companion for validator self-vote in bags (#5088)
  Extract MAX_FINALITY_LAG constant from relay_chain_selection (#5159)
@github-actions github-actions bot mentioned this pull request Apr 20, 2022
Closed
@github-actions github-actions bot mentioned this pull request Jul 18, 2022
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@KiChjang KiChjang KiChjang approved these changes

@wigy-opensource-developer wigy-opensource-developer wigy-opensource-developer approved these changes

@andresilva andresilva Awaiting requested review from andresilva

@RGafiyatullin RGafiyatullin Awaiting requested review from RGafiyatullin

@pepyakin pepyakin Awaiting requested review from pepyakin

@skunert skunert Awaiting requested review from skunert

@bkchr bkchr Awaiting requested review from bkchr

@davxy davxy Awaiting requested review from davxy

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. I3-bug Fails to follow expected behavior.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Test terminates_on_timeout fails with latest Substrate
5 participants
@koute @KiChjang @davxy @shawntabrizi @wigy-opensource-developer