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

Bump Bridges Subtree#2978

Merged
tomusdrw merged 2 commits intomasterfrom
hc-bump-bridges-subtree-take-2
May 5, 2021
Merged

Bump Bridges Subtree#2978
tomusdrw merged 2 commits intomasterfrom
hc-bump-bridges-subtree-take-2

Conversation

@HCastano
Copy link
Copy Markdown
Contributor

@HCastano HCastano commented May 4, 2021

This PR supersedes #2960, which updated the parity-bridges-common subtree in
preparation for Wococo<>Rococo bridge support.

Turns out that if we squash-merge these subtree update PRs then the subtree history in
future updates won't be super accurate (but the diff will look correct). The history,
which is what you see in this commit for example 70985ce, will always start at the same
commit instead of showing the changes between the last update and the current update.

In our case that means every subtree update's commit history will be from:

f51fb59d Prefix in relay loops logs (#920) -> parity-bridges-common@HEAD

Instead of:

parity-bridges-common@HEAD-at-last-update -> parity-bridges-common@HEAD

To re-emphasize, please do not squash-merge this - we need to do a regular merge 🙂

HCastano added 2 commits May 4, 2021 15:27
b2099c5c Bump Substrate to `b094edaf` (#958)
3f037094 Bump endowment amounts on Rialto and Millau (#957)
b21fd07c Bump Substrate WASM builder (#947)
30ccd07c Bump Substrate to `ec180313` (#955)
a7422ab1 Upgrade to GitHub-native Dependabot (#945)
ed20ef34 Move pallet-bridge-dispatch types to primitives (#948)
2070c4d6 Endow accounts and add `bridgeIds` to chainspec. (#951)
f43c9243 Fix account derivation in CLI (#952)
9ac07e73 Add backbone configuration of cargo-spellcheck (#924)
2761c3fe Message dispatch support multiple instances (#942)
801c99f3 Add Wococo<>Rococo Header Relayer (#925)
21f49051 Remove Westend<>Rococo header sync (#940)
06235f16 do not panic if pallet is not yet initialized (#937)
a13ee0bc Bump Substrate (#939)
f8680cbf jsonrpsee alpha6 (#938)
6163bcbf reonnect to failed client in on-demand relay background task (#936)
14e82bea Do not spawn additional task for on-demand relays (#933)
b1557b88 Relay at least one header for every source chain session (#923)
9420649c Remove deprecated Runtime Header APIs (#932)
9627011e Update README.md (#931)
7b736b9c Truncate output in logs. (#930)
faad06e3 Make sure that relayers have dates in logs. (#927)
07734535 Update dump-logs script. (#928)
c2d56b2e Add pruning to bechmarks & update weights. (#918)
a30c51dc Add properties to Chain Spec (#917)
d691c73e Fix issue with on-demand headers relay not starting (#921)
8ee55c1e Fix image publishing. (#922)
f51fb59d Prefix in relay loops logs (#920)

git-subtree-dir: bridges
git-subtree-split: b2099c5c0baf569e2ec7228507b6e4f3972143cc
@HCastano HCastano added A0-please_review Pull request needs code review. 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 May 4, 2021
@HCastano HCastano requested a review from tomusdrw May 4, 2021 19:43
Copy link
Copy Markdown
Contributor

@tomusdrw tomusdrw left a comment

Choose a reason for hiding this comment

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

Looks good, as mentioned in description please don't squash, but regular-merge this.

@tomusdrw tomusdrw merged commit a08b46d into master May 5, 2021
@tomusdrw tomusdrw deleted the hc-bump-bridges-subtree-take-2 branch May 5, 2021 14:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

A0-please_review Pull request needs code review. 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

Development

Successfully merging this pull request may close these issues.

2 participants