Skip to content

Commit

Permalink
Merge branch 'master' into steering_lib_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored May 8, 2024
2 parents ba808b1 + 009f946 commit 434c801
Show file tree
Hide file tree
Showing 216 changed files with 3,616 additions and 2,111 deletions.
6 changes: 3 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ pull_request_rules:
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=dstogl
- author!=destogl
- author!=christophfroehlich
- 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`
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.
33 changes: 0 additions & 33 deletions .github/reviewer-lottery.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/ci-coverage-build-humble.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/ci-coverage-build-iron.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/ci-coverage-build.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/ci-format.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/ci-ros-lint.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ on:
pull_request:
branches:
- humble
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-abi-compatibility.yml'
- '**.yaml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.humble.repos'

jobs:
abi_check:
Expand Down
Loading

0 comments on commit 434c801

Please sign in to comment.