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(github): Detect GitHub automerge setting #12398

Merged

Conversation

zharinov
Copy link
Collaborator

Changes:

Use detected autoMergeAllowed setting instead of fail-and-retry tactics.

Context:

Ref #12363

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 tick 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

return;
}
delete repoCache.lastPlatformAutomergeFailure;
if (!config.autoMergeAllowed) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This should separate errors from disabled repositories and help us to focus on interesting failure cases.

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.

Looks good to me

@rarkins rarkins enabled auto-merge (squash) October 29, 2021 17:28
@rarkins rarkins merged commit 627681c into renovatebot:main Oct 29, 2021
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 28.17.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

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.

None yet

4 participants