zeitgeist
zeitgeist copied to clipboard
zeitgeistpm
Add simple mergify config. It uses branch protection rules from github configuration.
We need to update branch protection rules as per our requirements and mergify will use them to automatically merge PRs. https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule
This should fix https://github.com/zeitgeistpm/zeitgeist/issues/688 , in github branch protection rules we should choose setting to enforce checking latest test checks success.
Started a review. You are right, it should resolve #688 if configured properly. As stated in the mergify documentation, mergify will always merge main into a PR before giving green lights for a merge:
That way, there's no way to merge a broken pull request into the base branch.
Looks cool. Agree with @sea212's suggestions. While we're at it, can we add rules for the following?
* Ensure that merge is squashed (wouldn't surprise me if this is impossible) * Ensure that the PR was reviewed
both of these rules are available in github's branch protection mechanism
@maltekliemann Squash and merge is already enforced, I requested setting a minimum review count to the admin.
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule here rule 11 require merge queue will be required right @sea212 ?
Passing status checks and minimum review count have been configured in the repository. Merge queue is in public beta, we have requested access and are await response.
Passing status checks and minimum review count have been configured in the repository. Merge queue is in public beta, we have requested access and are await response.
how do we check the status for this?
@lsaether could you please check if we have got access to merge queue?
What's the blocker here? Also, can we get a notification when one of our PRs needs to resolve a merge conflict? https://docs.mergify.com/actions/comment/#request-for-action
What's the blocker here? Also, can we get a notification when one of our PRs needs to resolve a merge conflict? https://docs.mergify.com/actions/comment/#request-for-action
We are waiting for merge queue access, however it seems like only admin can check that.
Codecov Report
Merging #777 (9131dbb) into main (a3894f4) will increase coverage by
0.02%. The diff coverage isn/a.
:exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.
@@ Coverage Diff @@
## main #777 +/- ##
==========================================
+ Coverage 94.50% 94.52% +0.02%
==========================================
Files 93 92 -1
Lines 21090 20987 -103
==========================================
- Hits 19931 19838 -93
+ Misses 1159 1149 -10
| Flag | Coverage Δ | |
|---|---|---|
| tests | 94.52% <ø> (+0.02%) |
:arrow_up: |
Flags with carried forward coverage won't be shown. Click here to find out more.
see 58 files with indirect coverage changes
