Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase cloning depth for a companion merge #16

Merged
merged 1 commit into from
Dec 6, 2021

Conversation

rcny
Copy link
Contributor

@rcny rcny commented Dec 6, 2021

No description provided.

@rcny rcny self-assigned this Dec 6, 2021
@rcny rcny requested a review from TriplEight December 6, 2021 19:38
@rcny
Copy link
Contributor Author

rcny commented Dec 6, 2021

Fixes this.

@rcny
Copy link
Contributor Author

rcny commented Dec 6, 2021

Fixes this.

Got confirmation from @bkchr.

@rcny rcny merged commit 9a1b2d0 into master Dec 6, 2021
@rcny rcny deleted the vi-fix-check-dependent-3 branch December 6, 2021 19:44
@joao-paulo-parity
Copy link
Contributor

@rcny what was the thought process or reasoning for this change?

Only the HEAD code is used for the integration, so cloning more of the history should not matter for anything.

@bkchr
Copy link
Member

bkchr commented Dec 14, 2021

@joao-paulo-parity we now merge master into the companion and the local branch. That required this.

@joao-paulo-parity
Copy link
Contributor

@joao-paulo-parity we now merge master into the companion and the local branch. That required this.

@bkchr what is the point of bringing in master's code before the check? The master you merge at the time the check is ran is not guaranteed to be representative of how master is at the time the merge is done. I'm guessing there is a reason why it is necessary in some cases, but I could not find an explanation.

The script used to only consider the code in the current branch, therefore one would be able reason about why it failed exactly. By bringing in the master's code at the time the check runs you get rid of this predictability. That detail might not be relevant anyways, but if the behavior is changed, it should have been motivated with a comment in the code. I found #10 (comment) but it does not explain why it is necessary.

@bkchr
Copy link
Member

bkchr commented Dec 14, 2021

Let's assume you have a pr that doesn't require any companion. It builds fine with Polkadot, however in the mean time someone merged a breaking change. You will try to compile with Polkadot master, but that will fail because you don't have the required Substrate changes in your branch. Merging master into the Polkadot companion makes it easier for you when you have merged master into your Substrate branch, because you don't need to update the Polkadot companion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants