automate git subtree-push pull requests#6032
Open
ytmimi wants to merge 1 commit into
Open
Conversation
bdcdd90 to
717f1ea
Compare
717f1ea to
2aa603d
Compare
2aa603d to
5d79b74
Compare
5d79b74 to
c2bdaec
Compare
73b3d58 to
8e1764f
Compare
8e1764f to
87d9ff0
Compare
87d9ff0 to
daf12a3
Compare
daf12a3 to
72cdeb2
Compare
72cdeb2 to
34f5a5e
Compare
7473c98 to
c66c66c
Compare
c66c66c to
57ff0b0
Compare
57ff0b0 to
5234f9c
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
5234f9c to
56a7c13
Compare
56a7c13 to
71224dc
Compare
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
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.
r? @calebcartwright
Here's an example of what the automated subtree-push PR looks like, and Here's a link to the GitHub Actions logs.
I want to note that PRs are still created even if there are issues creating the merge commit. In those cases one of us would just need to manually fix the merge conflicts and bump the toolchain. Here's an example of what the PR might look like when the merge fails for any reason, and here are the associated logs. I believe this one failed because of git history issues that I fixed 😁.
I've got this setup as a manual trigger right now. I figure it would be best to run it manually a few times and try to work out any kinks, and if things are working well we can consider running this on a cron schedule.