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

Switch to use diener patch for companion build #8073

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Conversation

bkchr
Copy link
Member

@bkchr bkchr commented Feb 8, 2021

This switch to the new diener patch command to patch all Substrate
crates in Polkadot. This should remove the requirement to manually merge
Substrate master to make the companion build, as we now would use the
already with master merged code from this build job local checkout.

This switch to the new `diener patch` command to patch all Substrate
crates in Polkadot. This should remove the requirement to manually merge
Substrate master to make the companion build, as we now would use the
already with master merged code from this build job local checkout.
@bkchr bkchr 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 Feb 8, 2021
@bkchr bkchr requested a review from TriplEight February 8, 2021 14:14
@bkchr bkchr requested a review from gui1117 February 9, 2021 16:42
Copy link
Contributor

@TriplEight TriplEight left a comment

Choose a reason for hiding this comment

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

We already have diener installed in the CI image. I suggest just bump the version there instead of installing it again, over and over.

@bkchr
Copy link
Member Author

bkchr commented Feb 9, 2021

We already have diener installed in the CI image. I suggest just bump the version there instead of installing it again, over and over.

Can we do this in a non-breaking way? The problem is that this new version isn't compatible with the old one. And I'm aware that we have installed it in the CI image. My idea was to update it here first, wait some days and update the CI image after this.

Copy link
Contributor

@gnunicorn gnunicorn left a comment

Choose a reason for hiding this comment

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

lgtm

@bkchr bkchr merged commit 90bb153 into master Feb 10, 2021
@bkchr bkchr deleted the bkchr-diener-patch branch February 10, 2021 11:38
@TriplEight
Copy link
Contributor

We already have diener installed in the CI image. I suggest just bump the version there instead of installing it again, over and over.

Can we do this in a non-breaking way? The problem is that this new version isn't compatible with the old one. And I'm aware that we have installed it in the CI image. My idea was to update it here first, wait some days and update the CI image after this.

CI image is updated every night (unless it's blocked by something else I.e. in substrate tests).
Ok, I got you, will do this after I'm back from vacation.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants