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

ci(mergify): do not create draft PRs if not needed #4540

Merged
merged 3 commits into from
Jun 1, 2022

Conversation

gustavovalverde
Copy link
Member

@gustavovalverde gustavovalverde commented May 31, 2022

Motivation

We included Merge Freeze (https://www.mergefreeze.com/) as a tool to halt PRs when a critical path has to be accomplished, a release for example, and we don't want other PRs to get merged as this would invalidate part of the work being done for this critical path.

But we also have Mergify, which creates drafts PRs before merging (as we did not want all PRs being co-authored by Mergify), but those PRs also get freezed as those are not part of the exception rule, and are dynamically created.

Fixes #4137
Fixes Partially #3360
Closes #4110 (caused by a temporal mergify error)

Partially reverts: 6fafd1a

Solution

  • Fallback to use allow_inplace_checks

Review

Anyone from @ZcashFoundation/devops-reviewers can review this

Follow Up Work

  • Confirm everyone has logged in in the Mergify dashboards

@gustavovalverde gustavovalverde added C-bug Category: This is a bug A-docs Area: Documentation A-devops Area: Pipelines, CI/CD and Dockerfiles P-Medium ⚡ I-usability Zebra is hard to understand or use labels May 31, 2022
@gustavovalverde gustavovalverde requested a review from a team as a code owner May 31, 2022 12:13
@gustavovalverde gustavovalverde self-assigned this May 31, 2022
@gustavovalverde gustavovalverde requested review from conradoplg and removed request for a team May 31, 2022 12:13
Copy link
Collaborator

@conradoplg conradoplg 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! Thanks for the additional comments

@gustavovalverde
Copy link
Member Author

gustavovalverde commented Jun 1, 2022

Mergify configurations changes are not automatically merged. Merging manually

@gustavovalverde gustavovalverde merged commit 8d6957f into main Jun 1, 2022
@gustavovalverde gustavovalverde deleted the imp-mergify-prs branch June 1, 2022 18:40
@teor2345 teor2345 restored the imp-mergify-prs branch June 1, 2022 23:07
@teor2345 teor2345 deleted the imp-mergify-prs branch June 1, 2022 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-devops Area: Pipelines, CI/CD and Dockerfiles A-docs Area: Documentation C-bug Category: This is a bug I-usability Zebra is hard to understand or use
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge Freeze causes all Mergify PRs to fail Work out how to avoid merging invalid Mergify configs
2 participants