Skip to content

Use GitHub REST API to get the merge base commit SHA#105098

Closed
huydhn wants to merge 9 commits intopytorch:mainfrom
huydhn:fix-trymerge-get-merge-base
Closed

Use GitHub REST API to get the merge base commit SHA#105098
huydhn wants to merge 9 commits intopytorch:mainfrom
huydhn:fix-trymerge-get-merge-base

Conversation

@huydhn
Copy link
Contributor

@huydhn huydhn commented Jul 12, 2023

Fixes #104713

Testing

Manual testing locally using #104121 and confirm that the correct merge base commit is returned 803c14490b189f9b755ecb9f2a969876088ea243 instead of the wrong value provided by baseRefOid (de7b6e5). Here is the JSON output of the GraphQL query for PR info https://paste.sh/TJ-QQWz4#fvE3Y6qoJ8vDkRBZ3vowkZ3m

cc @albanD

@huydhn huydhn requested review from clee2000 and malfet July 12, 2023 23:31
@huydhn huydhn requested a review from a team as a code owner July 12, 2023 23:31
@pytorch-bot
Copy link

pytorch-bot bot commented Jul 12, 2023

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/105098

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit 12e00b0:
💚 Looks good so far! There are no failures yet. 💚

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

@pytorch-bot pytorch-bot bot added the topic: not user facing topic category label Jul 12, 2023
@huydhn huydhn requested a review from malfet July 13, 2023 21:24
@huydhn
Copy link
Contributor Author

huydhn commented Jul 14, 2023

Notice a bunch of force-merged ghstack PRs today where broken trunks were shown as new failures:

So I add a test case for ghstack to make sure that mergebot correctly recognize them as broken trunk. Also, Dr.CI shouldn't show them as new failures, which I will fix in a separate PR

@huydhn
Copy link
Contributor Author

huydhn commented Jul 14, 2023

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jul 14, 2023
@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Problematic use of baseRefOid to get the merge base commit in trymerge

3 participants