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

feat: allow previously merged PRs, but block automerge #22279

Merged
merged 2 commits into from May 17, 2023

Conversation

rarkins
Copy link
Collaborator

@rarkins rarkins commented May 17, 2023

Changes

Instead of blocking PRs if a matching one was previously merged, we now allow it to be opened but instead block automerge if enabled, to avoid endless automerge-revert-automerge loops.

Context

Closes #16820

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@rarkins rarkins requested review from viceice and secustor May 17, 2023 04:54
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

otherwise LGTM

lib/workers/repository/update/branch/index.ts Show resolved Hide resolved
@rarkins rarkins requested a review from viceice May 17, 2023 17:30
@rarkins rarkins enabled auto-merge May 17, 2023 17:30
@rarkins rarkins added this pull request to the merge queue May 17, 2023
Merged via the queue into main with commit b5d74a8 May 17, 2023
11 checks passed
@rarkins rarkins deleted the feat/16820-recreate-merged-prs branch May 17, 2023 21:31
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 35.93.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Recreate merged PRs if updates are available
4 participants