-
Notifications
You must be signed in to change notification settings - Fork 169
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
Add trymerge #388
Add trymerge #388
Conversation
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/ao/388
Note: Links to docs will display an error until the docs builds have been completed. ❌ 1 New FailureAs of commit ac79467 with merge base eb1511e (): NEW FAILURE - The following job has failed:
This comment was automatically generated by Dr. CI and updates every 15 minutes. |
Btw, I did a similar move for ExecuTorch a while ago pytorch/executorch#2716 so that Edge team can use the cherry-pick feature (also part of mergebot). So, this justifies the need to move trymerge to somewhere that is reusable. The trickiest part to update would be https://www.internalfb.com/code/fbsource/fbcode/smart/pytorch/github_first_try_merge/my_handler.py?lines=24 where it refers to the trymerge script from PyTorch |
You'll probably need https://github.com/pytorch/pytorch/blob/main/.github/workflows/revert.yml as well to complete the process. |
Do you need a simple merge_rules like https://github.com/pytorch/executorch/blob/main/.github/merge_rules.yaml too? I don't remember off the top of my head how mergebot behaves without that file |
Given that there is some precedent for just copying the files over, I decided to just copy them over and only removed the check for sev + release notes label
Holding off on this for now since I have no idea how or if it works with normally merged GH PRs
Added merge_rules.yaml |
Stamped! Just FYI, now that trymerge is here, if cherry pick bot is needed, you could also copy https://github.com/pytorch/pytorch/blob/main/.github/workflows/cherry-pick.yml and https://github.com/pytorch/pytorch/blob/main/.github/scripts/cherry_pick.py over |
Tested locally using --dry-run Apparently there is precedent for just copying the files over (see executorch PR huy linked below), so this copies over trymerge + dependencies Removes check for release notes labels and sev Can merge both ghstack and normal PRs. Be warned though, PRs merged this way will show up as "closed" instead of "merged" on the github UI Future work: move trymerge + dependencies to test-infra (or download from pytorch), make sure its repo agnostic Depends on pytorch/test-infra#5312
Tested locally using --dry-run
Apparently there is precedent for just copying the files over (see executorch PR huy linked below), so this copies over trymerge + dependencies
Removes check for release notes labels and sev
Can merge both ghstack and normal PRs. Be warned though, PRs merged this way will show up as "closed" instead of "merged" on the github UI
Future work: move trymerge + dependencies to test-infra (or download from pytorch), make sure its repo agnostic
Depends on pytorch/test-infra#5312