Skip to content

Commit f5c6014

Browse files
nixpanicmergify[bot]
authored andcommitted
ci: let mergify add ok-to-test again when a PR gets queued
By default Mergify adds the `queued` label immediately, so that can not be used in a check. The new `ci/in-progress/e2e` label will prevent Mergify from adding the `ok-to-test` label in a loop. When there is an issue with merge ordering, it may be required to remove the `ci/in-progress/e2e` label or manually add `ok-to-test` again. Signed-off-by: Niels de Vos <[email protected]>
1 parent 911ffd9 commit f5c6014

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

.mergify.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,26 @@ merge_queue:
9292
max_parallel_checks: 1
9393

9494
pull_request_rules:
95+
- name: start CI jobs for PRs in the merge queue
96+
conditions:
97+
- -closed
98+
- base~=^(devel)|(release-.+)$
99+
- label!=conflicts
100+
- label!=ci/skip/e2e
101+
- label!=ci/in-progress/e2e
102+
- not:
103+
check-pending~=^ci/centos
104+
- not:
105+
status-success~=^ci/centos
106+
- or:
107+
- "check-pending=Queue: Embarked in merge queue"
108+
- author=mergify[bot]
109+
actions:
110+
label:
111+
add:
112+
- ok-to-test
113+
- ci/in-progress/e2e
114+
95115
- name: remove outdated approvals
96116
conditions:
97117
- base~=^(devel)|(release-.+)$

0 commit comments

Comments
 (0)