Skip to content

Commit

Permalink
have Mergify insist on all-green CI
Browse files Browse the repository at this point in the history
GitHub's branch protection rules just don't cut it. (As a result,
neither does GitHub's merge queue.)
  • Loading branch information
geekosaur committed Oct 6, 2024
1 parent 47139c5 commit d9c2b40
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,7 @@ pull_request_rules:
- label=merge+no rebase
- '#approved-reviews-by>=2'
- '#changes-requested-reviews-by=0'
# oy
# lifted these from branch protection imports
- check-success=fourmolu
- check-success=hlint
- check-success=Meta checks
- check-success=Doctest Cabal
- check-success=Validate post job
- check-success=Bootstrap post job
- 'check-success=docs/readthedocs.org:cabal'
- '#check-failure=0'

# rebase+merge strategy
- actions:
Expand All @@ -73,6 +65,7 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'

# merge+squash strategy
- actions:
Expand All @@ -85,6 +78,7 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'

# merge+no rebase strategy
- actions:
Expand All @@ -97,6 +91,11 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'
# unlike the others, we need to force this one to be up to date
# because it's intended for when Mergify doesn't have permission
# to rebase
- '#commits-behind=0'

# merge strategy for release branches
- actions:
Expand All @@ -109,6 +108,7 @@ pull_request_rules:
- -body~=backport
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'

# merge+squash strategy for release branches
- actions:
Expand All @@ -121,6 +121,7 @@ pull_request_rules:
- -body~=backport
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'

# merge strategy for backports: require 1 approver instead of 2
- actions:
Expand All @@ -133,6 +134,7 @@ pull_request_rules:
- body~=backport
- '#approved-reviews-by>=1'
- '-label~=^blocked:'
- '#check-failure=0'

# merge+squash strategy for backports: require 1 approver instead of 2
- actions:
Expand All @@ -145,6 +147,7 @@ pull_request_rules:
- body~=backport
- '#approved-reviews-by>=1'
- '-label~=^blocked:'
- '#check-failure=0'

# backports should be labeled as such
- actions:
Expand Down

0 comments on commit d9c2b40

Please sign in to comment.