Don't ignore "ready to merge" followed by additional approvals #197
Conversation
This file contains 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
|
This looks like a reasonable thing to do. IIUC, it works because the loop considers only reviews for the current head commit, so there's no problem with finding an approval that came in and was followed by further commits. (Like your other PRs, I want to keep an eye on the bot after such changes, so I'll merge it when it's my cycle.) |
|
That'd be great, thanks! |
Since DefinitelyTyped#190 we ignore "ready to merge" comments predating the most recent review. That change explicitly discounts the most recent comment date, so additional comments don't trample the "ready to merge" request, however additional approvals still do: DefinitelyTyped/DefinitelyTyped#48236 We can't drop the `lastReviewDate` from the `sinceDates` entirely without reopening DefinitelyTyped#164, demonstrated in DefinitelyTyped/DefinitelyTyped#46120, so the next simplest thing is to replace it with the earliest (non-stale) approval date. This works for DefinitelyTyped/DefinitelyTyped#46120 (continues to ignore requests preceding approval) and DefinitelyTyped/DefinitelyTyped#48236 (additional approvals don't trample requests, like additional comments don't).
* Adjust new test to other changes to file checking. * Move the code that makes `firstApprovalDate` next to `lastReviewDate`. * Make it compare the dates in the same way that `lastReviewDate` is done, to avoid relying on the order of entries. * Also move it in the json and adjust tests.
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.
Since #190 we ignore "ready to merge" comments predating the most recent review. That change explicitly discounts the most recent comment date, so additional comments don't trample the "ready to merge" request, however additional approvals still do: DefinitelyTyped/DefinitelyTyped#48236
We can't drop the
lastReviewDatefrom thesinceDatesentirely without reopening #164, demonstrated in DefinitelyTyped/DefinitelyTyped#46120, so the next simplest thing is to replace it with the earliest (non-stale) approval date?This works for DefinitelyTyped/DefinitelyTyped#46120 (continues to ignore requests preceding approval) and DefinitelyTyped/DefinitelyTyped#48236 (additional approvals don't trample requests, like additional comments don't).