-
Notifications
You must be signed in to change notification settings - Fork 3
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
Document why master merge before the check is necessary #17
Comments
#16 (comment) hints at the source of the problem
It all stems from the master code being merged into the PR branch at the start https://github.com/paritytech/pipeline-scripts/blob/master/check_dependent_project.sh#L232-L233 Therefore all the companions also have to buy into this approach since each of them might also not have the "possibly breaking changes" necessary to keep up with the job's PR brought-in master code. It is possible to sidestep the problem entirely by not merging master into any branch before doing the checks. Pro: Avoids Con: We'll give up on the "pre-merge" intention mentioned in the comments pipeline-scripts/check_dependent_project.sh Lines 232 to 233 in 9a1b2d0
IMO that is fine because pre-merge pipelines are implemented elsewhere (https://github.com/paritytech/ci_cd/issues/162). |
…m and simplification; pre-merge flows can be implemented on some other check more context given in paritytech#17 (comment)
After discussing the problem at length with @TriplEight (some of the topics should be moved to docs at some point), the upside of merging master seems worth it despite all the extra complication. By doing so we'll have better expectations of the integration not breaking after a PR lands on master. Nondeterminism due to fetching + merging alien code into the branches throughout the whole dependency chain still makes the pipeline overall harder to reason about. We'll attempt to counteract that by providing better failure messages and raising awareness of how the job works step-by-step. Implementation starts at dae5933. |
…m and simplification; pre-merge flows can be implemented on some other check more context given in #17 (comment)
Initially discussed in #16 (comment) and more motivation given in #16 (comment).
This change might have caused a failure reported in the CI channel
The Cumulus companion was cloned with SHA 042f3c4, but then more code was brought in from master which might have caused the failure. Regardless of this being the actual reason or not, there are two problems to consider
The text was updated successfully, but these errors were encountered: