Consider all companions from all PRs descriptions #19
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m and simplification; pre-merge flows can be implemented on some other check more context given in paritytech#17 (comment)
This was referenced Dec 15, 2021
check_dependent_project.sh
Outdated
|
|
||
| echo "Patching $this_repo into $dependent" | ||
| diener patch \ | ||
| --target "$org_github_prefix/$comp" \ |
There was a problem hiding this comment.
since we'll be using --target from now on instead of the fixed --substrate, --polkadot, --cumulus, etc., $this_repo_diener_arg can be deprecated. I plan to do so in a future PR (#20).
| fi | ||
|
|
||
| echo "running checks for the default branch of $dependent_repo" |
There was a problem hiding this comment.
This is just duplicated logic which was moved into patch_and_check_dependent
|
paritytech/substrate#10496 (comment) The implementation scope for this PR is complete |
TriplEight
suggested changes
Dec 15, 2021
@TriplEight it was tested paritytech/substrate#10496 (comment) |
TriplEight
approved these changes
Dec 17, 2021
Comment on lines
234
to
244
| Attempting to merge $repo#$pr_number with master after fetching its last $merge_ancestor_max_depth commits. | ||
|
|
||
| If this step fails, either: | ||
|
|
||
| - $repo#$pr_number has conflicts with master | ||
|
|
||
| *OR* | ||
|
|
||
| - A common merge ancestor could not be found between master and the last $merge_ancestor_max_depth commits of $repo#$pr_number. | ||
|
|
||
| Both cases can be solved by merging master into $repo#$pr_number. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related to #17
trialed in paritytech/substrate#10496
closes #3