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

Companion PR for ' Simplify a few chain components creation APIs related to the service' #1384

Merged
merged 8 commits into from
Jul 9, 2020
Merged

Companion PR for ' Simplify a few chain components creation APIs related to the service' #1384

merged 8 commits into from
Jul 9, 2020

Conversation

expenses
Copy link
Contributor

@expenses expenses commented Jul 9, 2020

@expenses expenses 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 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. labels Jul 9, 2020
@tomaka
Copy link
Contributor

tomaka commented Jul 9, 2020

If you modify the Cargo.tomls to point to your branch, then the bot will behave incorrectly when trying to merge it.

@expenses
Copy link
Contributor Author

expenses commented Jul 9, 2020

@tomaka I don't understand what you're saying. I'm going to revert the Cargo.toml changes after the substrate PR is merged.

@expenses expenses mentioned this pull request Jul 9, 2020
Merged
@expenses
Revert "Switch branch"
1166ac2 
This reverts commit a706335.
@tomaka
Copy link
Contributor

tomaka commented Jul 9, 2020

Substrate PRs are supposed to be merged by a bot now. If you ask the bot to merge a Substrate PR that has a companion PR, the bot then immediately and automatically does cargo update -p sp-io and merges the companion PR in question.

@expenses
Copy link
Contributor Author

expenses commented Jul 9, 2020

@tomaka Oh, okay.

@expenses
Copy link
Contributor Author

expenses commented Jul 9, 2020

I'm confused, these changes don't compile without the branch switch, so now the substrate gitlab-check-polkadot-companion-build is failing and I can't merge this.

@tomaka
Copy link
Contributor

tomaka commented Jul 9, 2020

The CI didn't detect any companion PR: https://gitlab.parity.io/parity/substrate/-/jobs/586119/raw (search for "companion")
I think you have to indicate the companion in the PR description and not in a comment.

@expenses expenses requested a review from bkchr July 9, 2020 14:40
@expenses
Copy link
Contributor Author

expenses commented Jul 9, 2020

Just need an approval then ill merge

@bkchr bkchr merged commit 8347bf8 into master Jul 9, 2020
@bkchr bkchr deleted the ashley-txpool branch July 9, 2020 15:00
pepyakin added a commit that referenced this pull request May 4, 2022
@pepyakin
Squashed 'bridges/' changes from f220d2fccab..d2faa6b2600
c0c1eee 
d2faa6b2600 Update spec_version for Rococo (#1387)
b3d701124fe Remove support for encoded-call messaging from relay and runtime integration code (#1376)
7f1c4af6650 fix copypaste (#1386)
4e195205ae2 re-enable BEEFY alarms for Rialto (#1385)
072ae865d6b fix for "`/root` is not writable." during deployments startup (#1384)
3ab1810b071 fix daily gitlab build (#1383)
3317b8a6811 Update Substrate/Polkadot refs for latest BEEFY + xcm-v3 capability (#1381)
ebfa9f2fef8 remove vault from ci (#1382)
82136eb42e3 Switch to gav-xcm-v3 branch to be able to test bridges + XCMv3 integration (#1378)
aa8896475b6 Revert "mention encoded-calls-messaging tag"
80c0f7ee05d mention encoded-calls-messaging tag
c7c6f0ce5e8 Revert "add api data() for inbound_lane (#1373)" (#1375)
6ef6bcc0169 FinalityEngine in substrate relay (#1374)
82698e3e082 add api data() for inbound_lane (#1373)
74a48878f86 pub use WeightInfo in Grandpa + Messsages pallets (#1370)
2cc27b7abb5 Update Substrate/Polkadot/Cumulus references (#1364)
9f3ffcd59c7 [ci] Use bridges-ci:production image in the pipeline (#1365)
61766e31f2e Few typos and clippy fixes (#1362)
REVERT: f220d2fccab Polkadot staging update (#1356)
REVERT: 92ddc3ea7a8 Polkadot-staging update (#1305)
REVERT: 29eecdf1fa1 Merge pull request #1294 from paritytech/polkadot-staging-update
REVERT: 173d2d82297 Merge pull request #1280 from paritytech/polkadot-staging-update
REVERT: 54146416e7f Merge pull request #1276 from paritytech/polkadot-staging-update
REVERT: df701181745 Merge branch 'master' into polkadot-staging-update
REVERT: f704a741ee8 Polkadot staging update (#1270)
REVERT: 1602249f0a2 Enable Beefy debug logs in test deployment (#1237)
REVERT: c61d240b474 Fix storage parameter name computation (#1238)
REVERT: 96d3808e88f Integrate BEEFY with Rialto & Millau runtimes (#1227)
REVERT: f75a1bdd9ba update dependencies (#1229)
REVERT: 957da038547 Add mut support (#1232)
REVERT: 8062637289f fixed set_operational in GRANDPA pallet (#1226)
REVERT: 14b36ca4eef Add CODEOWNERS file (#1219)
REVERT: 3bec15766f6 Unify metric names (#1209)
REVERT: 0e839d2423e remove abandoned exchange relay (#1217)
REVERT: 2c91c6815cf Remove unused `relays/headers` (#1216)
REVERT: 80b1e65db82 Remove unused PoA<>Substrate bridge (#1210)
REVERT: f36f76fc2a7 Fix UI deployment. (#1211)
REVERT: fc0b65365bb Add `AtLeast32BitUnsigned` for MessageLance::SourceChainBalance (#1207)

git-subtree-dir: bridges
git-subtree-split: d2faa6b2600fea77d121f3c0767cf59211e597a3
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bkchr bkchr bkchr approved these changes

Assignees
No one assigned
Labels
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.
3 participants
@expenses @tomaka @bkchr