github:add mergify configuration #275
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| --- | ||
| defaults: | ||
| actions: | ||
| queue: | ||
| name: default | ||
| method: rebase | ||
| update_method: rebase | ||
|
|
||
|
|
||
| # each test should be listed separately, do not use regular expressions: | ||
| # https://docs.mergify.io/conditions.html#validating-all-status-check | ||
| # TODO: Use mergify's recently added 'shared configuration support' | ||
| # to dedup some of the check-x=y repetition in the future. | ||
| queue_rules: | ||
| - name: default | ||
| conditions: | ||
| - check-success=check | ||
| - check-success=build | ||
| - check-success=podmanbuild | ||
| - check-success=dockerbuild | ||
| - check-success=test | ||
| - check-success=test-kubernetes | ||
| - check-success=centos-ci/sink-clustered/mini-k8s-1.25 | ||
| - check-success=dpulls | ||
|
|
||
|
|
||
| pull_request_rules: | ||
| # Clearing approvals after content changes | ||
| - name: Remove outdated approvals | ||
| conditions: | ||
| - base=master | ||
| actions: | ||
| dismiss_reviews: | ||
| approved: true | ||
| changes_requested: false | ||
| # Perform automatic merge on conditions | ||
| - name: Automatic merge on approval | ||
| conditions: | ||
| - check-success=check | ||
|
There was a problem hiding this comment. Isn't this covered by the default queue? From what I understand, a queue action needs to be included to include the default queue. (Unless the defaults above calls it for you - but I prefer an explicit call to avoid confusion) There was a problem hiding this comment.
|
||
| - check-success=build | ||
| - check-success=podmanbuild | ||
| - check-success=dockerbuild | ||
| - check-success=test | ||
| - check-success=test-kubernetes | ||
| - check-success=centos-ci/sink-clustered/mini-k8s-1.25 | ||
| - check-success=dpulls | ||
| - "-draft" | ||
| # Contributors should set the 'do-not-merge' label if they don't want | ||
| # the PR to be (auto)merged for some reason. | ||
| - "label!=do-not-merge" | ||
| # A reviewer should set a label starting with 'review-in-progress' (and | ||
| # suffixed by their username) in order to indicate a detailed review has been | ||
| # started and not completed. This will hold the PR until the label has been | ||
| # removed. | ||
| - "-label~=^review-in-progress" | ||
| - "base=master" | ||
| # Even if there are 2 or more approvals we won't automerge if there are | ||
| # any changes requested. | ||
| - "#changes-requested-reviews-by=0" | ||
| - or: | ||
| # Any contributor's PR can be automerged with 2 (or more) reviews. | ||
| - "#approved-reviews-by>=2" | ||
| # A maintainer's contribution only needs 1 review BUT we give a grace | ||
| # period over just two weeks for a 2nd reviewer to hopefully appear. | ||
| - and: | ||
| - "updated-at<15 days ago" | ||
| - "author=@maintainers" | ||
| - "#approved-reviews-by>=1" | ||
| actions: | ||
| queue: {} | ||
| dismiss_reviews: {} | ||
|
Comment on lines
+69
to
+71
There was a problem hiding this comment. At first, I though we may need an explicit There was a problem hiding this comment. I think |
||
| # Conflict resolution prompt | ||
| - name: Ask contributor to resolve a conflict | ||
|
There was a problem hiding this comment. Should this pull_request_rule be above the previous one? From what I understand, the rules are executed in the order that they are listed. |
||
| conditions: | ||
| - conflict | ||
| actions: | ||
| comment: | ||
| message: "This pull request now has conflicts with the target branch. | ||
| Please resolve these conflicts and force push the updated branch." | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we put in an explicit merge call here. I don't see a merge call which is confusing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't seem to have it in the other repo either :...
https://github.com/samba-in-kubernetes/samba-container/blob/master/.github/mergify.yml#L14