Skip to content

Commit ebe9f55

Browse files
authored
Merge pull request #10465 from geekosaur/revert-green
Revert "have Mergify insist on all-green CI"
2 parents 5124e8a + 9f37a3f commit ebe9f55

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

.github/mergify.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,15 @@ pull_request_rules:
5252
- label=merge+no rebase
5353
- '#approved-reviews-by>=2'
5454
- '#changes-requested-reviews-by=0'
55-
- '#check-failure=0'
55+
# oy
56+
# lifted these from branch protection imports
57+
- check-success=fourmolu
58+
- check-success=hlint
59+
- check-success=Meta checks
60+
- check-success=Doctest Cabal
61+
- check-success=Validate post job
62+
- check-success=Bootstrap post job
63+
- 'check-success=docs/readthedocs.org:cabal'
5664

5765
# rebase+merge strategy
5866
- actions:
@@ -65,7 +73,6 @@ pull_request_rules:
6573
- label=merge delay passed
6674
- '#approved-reviews-by>=2'
6775
- '-label~=^blocked:'
68-
- '#check-failure=0'
6976

7077
# merge+squash strategy
7178
- actions:
@@ -78,7 +85,10 @@ pull_request_rules:
7885
- label=merge delay passed
7986
- '#approved-reviews-by>=2'
8087
- '-label~=^blocked:'
81-
- '#check-failure=0'
88+
# unlike the others, we need to force this one to be up to date
89+
# because it's intended for when Mergify doesn't have permission
90+
# to rebase
91+
- '#commits-behind=0'
8292

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

100105
# merge strategy for release branches
101106
- actions:
@@ -108,7 +113,6 @@ pull_request_rules:
108113
- -body~=backport
109114
- '#approved-reviews-by>=2'
110115
- '-label~=^blocked:'
111-
- '#check-failure=0'
112116

113117
# merge+squash strategy for release branches
114118
- actions:
@@ -121,7 +125,6 @@ pull_request_rules:
121125
- -body~=backport
122126
- '#approved-reviews-by>=2'
123127
- '-label~=^blocked:'
124-
- '#check-failure=0'
125128

126129
# merge strategy for backports: require 1 approver instead of 2
127130
- actions:
@@ -134,7 +137,6 @@ pull_request_rules:
134137
- body~=backport
135138
- '#approved-reviews-by>=1'
136139
- '-label~=^blocked:'
137-
- '#check-failure=0'
138140

139141
# merge+squash strategy for backports: require 1 approver instead of 2
140142
- actions:
@@ -147,7 +149,6 @@ pull_request_rules:
147149
- body~=backport
148150
- '#approved-reviews-by>=1'
149151
- '-label~=^blocked:'
150-
- '#check-failure=0'
151152

152153
# backports should be labeled as such
153154
- actions:

0 commit comments

Comments
 (0)