Skip to content

Commit

Permalink
Revert "have Mergify insist on all-green CI"
Browse files Browse the repository at this point in the history
It didn't do what was intended, and apparently Mergify is now
tripping over its own feet about it.

This reverts commit d9c2b40.
  • Loading branch information
geekosaur committed Oct 16, 2024
1 parent 5124e8a commit e8aced1
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,15 @@ pull_request_rules:
- label=merge+no rebase
- '#approved-reviews-by>=2'
- '#changes-requested-reviews-by=0'
- '#check-failure=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'

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

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

# merge+no rebase strategy
- actions:
Expand All @@ -91,11 +97,6 @@ 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 @@ -108,7 +109,6 @@ pull_request_rules:
- -body~=backport
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
- '#check-failure=0'

# merge+squash strategy for release branches
- actions:
Expand All @@ -121,7 +121,6 @@ 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 @@ -134,7 +133,6 @@ 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 @@ -147,7 +145,6 @@ 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 e8aced1

Please sign in to comment.