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

Merge retries and testthat #19

Merged
merged 2 commits into from
Mar 18, 2024
Merged

Merge retries and testthat #19

merged 2 commits into from
Mar 18, 2024

Conversation

wlandau
Copy link
Member

@wlandau wlandau commented Mar 18, 2024

This PR has:

  1. Better handling of failed merges such as Contribute remotes contributions#145. If a merge fails, the error message is reported, and the PR is not flagged for manual review. That way the bot can just retry next time. I do not think manual review is necessarily required if the bot already approved the PR, but it will need to do another automated review in case the contributor made any changes between rounds.
  2. Uses testthat. It's only a soft dependency now, and it's a much more ergonomic developer experience in my opinion.
  3. Removes some duplicate tests I found. Not sure why/how those got copied.

@wlandau wlandau self-assigned this Mar 18, 2024
@wlandau wlandau changed the title Merge retries and test that Merge retries and testthat Mar 18, 2024
Copy link
Member

@shikokuchuo shikokuchuo left a comment

Choose a reason for hiding this comment

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

I'm fine with the concept here of re-trying the next time.

(i) Could there be a problem where it keeps re-trying every hour? Potentially no one is monitoring the bot that often. Does it send an email to the submitter every time? That could become problematic.

(ii) do we know all the potential error messages that could be displayed? We don't want the possibility of leaking secrets or other internal information.

@wlandau
Copy link
Member Author

wlandau commented Mar 18, 2024

Great points on both. I just added a commit that omits the error message and adds a special retry-review label when a merge fails. Issues labeled retry-review should not get additional messages about merge failures.

Copy link
Member

@shikokuchuo shikokuchuo left a comment

Choose a reason for hiding this comment

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

Ok sounds good.

@shikokuchuo shikokuchuo merged commit 09ef891 into main Mar 18, 2024
12 checks passed
@shikokuchuo shikokuchuo deleted the retry-merge branch March 18, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants