question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

[GH Actions] Request review of automerge PR if there is a merge conflict

See original GitHub issue

If you haven’t already, check out our contributing guidelines for onboarding!


Problem

Typically, PRs that have the automerge label don’t need to be manually reviewed by anyone. In those cases, we don’t want to request a review. However, since we’ll be using automerge PRs to CP PRs to staging and/or production, we’ll have more cases where it can’t be automatically merged because of a merge conflict. In these cases, we need to request a reviewer on the PR so that the reviewer can manually resolve the merge conflict.

Why is this important?

This will be a pre-requisite of our Expensify.cash CP flows.

Solution

If this step of the automerge workflow exits with a nonzero exit code, add pullerbear as a reviewer on the PR.

Apply to this posting on Upwork: https://www.upwork.com/jobs/~01977821838810f422 https://github.com/Expensify/Expensify/issues/155154

Issue Analytics

  • State:closed
  • Created 3 years ago
  • Comments:7 (7 by maintainers)

github_iconTop GitHub Comments

1reaction
arielgreencommented, Mar 11, 2021

Sending over an offer in Upwork now, @mikeattara .

0reactions
mikeattaracommented, Mar 16, 2021

Update Currently, all pull requests require at least one approving review to be merged so I added a check on the automerge workflow for mergeability and mergeable_state.

  • Approve pull request if there is no merge conflict.
  • Merge pull request if there is no merge conflict and mergeable state is clean.

NB: Expensify/pullbearer is automatically added as a reviewer for all pull requests.

Read more comments on GitHub >

github_iconTop Results From Across the Web

Automatically merging a pull request - GitHub Docs
If you enable auto-merge for a pull request, the pull request will merge automatically when all required reviews are met and all required...
Read more >
GitHub Actions workflows for automatic rebasing and merging
After I submit a pull request for review, I typically start a new branch to start working on something else immediately. Later on,...
Read more >
Pull request auto-merge is now generally available
With auto-merge, pull requests can be set to merge automatically when all merge requirements are met. No more waiting on slow CI jobs...
Read more >
GitHub actions | Everything I know - My Knowledge Wiki
Merge Conflict Finder - Finds any merge conflicts in your repository. ... PR Merge Bot - GitHub action that manages pull request integrations....
Read more >
Review a merge request - GitLab Documentation
When your review is complete, you can submit the review. Your comments are now visible, and any quick actions included in your comments...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found