Skip to content

Commit

Permalink
ci: do not add the ok-to-test label if there is a conflict
Browse files Browse the repository at this point in the history
When there is a conflict in merging a PR, the `ok-to-test` label should
not be added automatically. This prevents a loop in triggering CI jobs
for PRs that might not even build.

Signed-off-by: Niels de Vos <[email protected]>
  • Loading branch information
nixpanic authored and Madhu-1 committed Apr 12, 2024
1 parent ae7f513 commit c1dd15a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ pull_request_rules:
- name: start CI jobs for PRs in the merge queue
conditions:
- base~=^(devel)|(release-.+)$
- label!=conflicts
- not:
check-pending~=^ci/centos
- not:
Expand Down

0 comments on commit c1dd15a

Please sign in to comment.