Skip to content

Commit

Permalink
Merge pull request #10465 from geekosaur/revert-green
Browse files Browse the repository at this point in the history
Revert "have Mergify insist on all-green CI"
  • Loading branch information
mergify[bot] authored Oct 16, 2024
2 parents 5124e8a + 9f37a3f commit ebe9f55
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 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,10 @@ 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+no rebase strategy
- actions:
Expand All @@ -91,11 +101,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 +113,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 +125,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 +137,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 +149,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 ebe9f55

Please sign in to comment.