Skip to content

[GHF] Better check for internal diffs#104344

Closed
malfet wants to merge 4 commits intogh/malfet/47/basefrom
gh/malfet/47/head
Closed

[GHF] Better check for internal diffs#104344
malfet wants to merge 4 commits intogh/malfet/47/basefrom
gh/malfet/47/head

Conversation

@malfet
Copy link
Copy Markdown
Contributor

@malfet malfet commented Jun 28, 2023

Stack from ghstack (oldest at bottom):

During revert, use title of "Meta Internal-Only Changes Check" to determine whether or not internal diff is associated with the PR. When PR is merged/closed, "Meta Internal-Only Changes Check" status is always success, but title message can differ:

  • "There is no internal Diff connected, this can be merged now" means that there are no internal change associated with PR (or it was landed via GitHub First workflow)
  • "The internal Diff has landed, this can be merged now" meaning that PR has associated internal DIFF, and OSS and internal reverts must happen in sync using internal tooling. (Or a revert PR can be authored in OSS)

Add regression test for #100652 that was originated from the internal diff, but was merged as OSS PR.

Fixes #104232

cc @albanD

During revert, use title of "Meta Internal-Only Changes Check" to
determine whether or not internal diff is associated with the PR.

Fixes #104232

[ghstack-poisoned]
@malfet malfet requested a review from a team as a code owner June 28, 2023 13:39
@pytorch-bot
Copy link
Copy Markdown

pytorch-bot bot commented Jun 28, 2023

🔗 Helpful Links

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

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

✅ 1 Unrelated Failure

As of commit fb87b85:

UNSTABLE - The following job failed but was likely due to flakiness present on trunk and has been marked as unstable:

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

During revert, use title of "Meta Internal-Only Changes Check" to determine whether or not internal diff is associated with the PR.

Fixes #104232

cc albanD

[ghstack-poisoned]
During revert, use title of "Meta Internal-Only Changes Check" to determine whether or not internal diff is associated with the PR.

Fixes #104232

cc albanD

[ghstack-poisoned]
Copy link
Copy Markdown
Member

@bigfootjon bigfootjon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please import this to fbsource to verify that the internal test suite will continue to work. I assume it will but this has been annoying to fix in the past

return False
return checks[checkrun_name].status != "SUCCESS"

def has_no_connected_diff(self) -> bool:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning a negative of a boolean value reduces readability, IMO replace this with has_connected_diff

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, but is it safe to say, that has_connect_diff() is true if status is anything but "There is no internal Diff connected, this can be merged now"?

During revert, use title of "Meta Internal-Only Changes Check" to determine whether or not internal diff is associated with the PR.

Fixes #104232

cc albanD

[ghstack-poisoned]
@malfet
Copy link
Copy Markdown
Contributor Author

malfet commented Jun 28, 2023

Please import this to fbsource to verify that the internal test suite will continue to work. I assume it will but this has been annoying to fix in the past

@bigfootjon I've not change any of the existing APIs nor added new dependencies, so imo it should be fine, but just to be on the safe side: https://www.internalfb.com/intern/sandcastle/job/18014399493129784/

@malfet
Copy link
Copy Markdown
Contributor Author

malfet commented Jun 28, 2023

@pytorchbot merge -f "Lint and relevant internal tests are green"

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes).

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.

5 participants