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

Add trymerge #388

Merged
merged 5 commits into from
Jun 20, 2024
Merged

Add trymerge #388

merged 5 commits into from
Jun 20, 2024

Conversation

clee2000
Copy link
Contributor

@clee2000 clee2000 commented Jun 17, 2024

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

Copy link

pytorch-bot bot commented Jun 17, 2024

🔗 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 Failure

As of commit ac79467 with merge base eb1511e (image):

NEW FAILURE - The following job has failed:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jun 17, 2024
@clee2000 clee2000 marked this pull request as draft June 17, 2024 17:24
@clee2000 clee2000 marked this pull request as ready for review June 17, 2024 20:54
@clee2000 clee2000 requested a review from huydhn June 17, 2024 21:33
@huydhn
Copy link
Contributor

huydhn commented Jun 17, 2024

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

@huydhn
Copy link
Contributor

huydhn commented Jun 17, 2024

You'll probably need https://github.com/pytorch/pytorch/blob/main/.github/workflows/revert.yml as well to complete the process.

@huydhn
Copy link
Contributor

huydhn commented Jun 17, 2024

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

@clee2000
Copy link
Contributor Author

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

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

You'll probably need https://github.com/pytorch/pytorch/blob/main/.github/workflows/revert.yml as well to complete the process.

Holding off on this for now since I have no idea how or if it works with normally merged GH PRs

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

Added merge_rules.yaml

@huydhn
Copy link
Contributor

huydhn commented Jun 18, 2024

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

@clee2000 clee2000 merged commit e6460c2 into main Jun 20, 2024
12 of 13 checks passed
dbyoung18 pushed a commit to dbyoung18/ao that referenced this pull request Jul 31, 2024
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants