Skip to content

Commit

Permalink
Minor CI updates (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Nov 20, 2024
1 parent 358552e commit b49057b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 4 deletions.
34 changes: 34 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
pull_request_rules:

- name: Ask to resolve conflict
conditions:
- conflict
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @{{author}}?

- name: Ask to resolve conflict for backports
conditions:
- conflict
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
- author!=saikishor
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
comment:
message: |
@{{author}}, all pull requests must be targeted towards the `master` development branch.
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
to have these changes reflected into new distributions.
4 changes: 0 additions & 4 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ coverage:
patch: off
fixes:
- "ros_ws/src/control_toolbox/::"
ignore:
- "**/test"
- "test"
- "test/**/*"
comment:
layout: "diff, flags, files"
behavior: default

0 comments on commit b49057b

Please sign in to comment.