Skip to content

Commit

Permalink
Merge branch 'ros2-master' into add/exp_filter
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Dec 1, 2024
2 parents afc34ba + eaee718 commit dcc8df6
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ pull_request_rules:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
- name: development targets ros2-master branch
conditions:
- base!=master
- base!=ros2-master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
Expand All @@ -29,6 +29,6 @@ pull_request_rules:
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`
@{{author}}, all pull requests must be targeted towards the `ros2-master` development branch.
Once merged into `ros2-master`, it is possible to backport to `{{base}}`, but it must be in `ros2-master`
to have these changes reflected into new distributions.
26 changes: 26 additions & 0 deletions .github/workflows/build-downstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Downstream Build
on:
pull_request:
push:
branches:
- ros2-master


jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, jazzy, humble]
ROS_REPO: [testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
ros_repo: ${{ matrix.ROS_REPO }}
ref_for_scheduled_build: ros2-master
not_test_build: true
downstream_workspace: ros_controls.${{ matrix.ROS_DISTRO }}.repos
not_test_downstream: true
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ repos:

# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.3
rev: v19.1.4
hooks:
- id: clang-format
args: ['-fallback-style=none', '-i']
Expand Down Expand Up @@ -132,7 +132,7 @@ repos:
exclude: CHANGELOG\.rst|\.(svg|pyc)$

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.4
rev: 0.30.0
hooks:
- id: check-github-workflows
args: ["--verbose"]
Expand Down
21 changes: 21 additions & 0 deletions ros_controls.humble.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:
ros-controls/control_msgs:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: humble
ros-controls/kinematics_interface:
type: git
url: https://github.com/ros-controls/kinematics_interface.git
version: humble
ros-controls/realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: master
ros-controls/ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: humble
ros-controls/ros2_controllers:
type: git
url: https://github.com/ros-controls/ros2_controllers.git
version: humble
21 changes: 21 additions & 0 deletions ros_controls.jazzy.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:
ros-controls/control_msgs:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: master
ros-controls/kinematics_interface:
type: git
url: https://github.com/ros-controls/kinematics_interface.git
version: master
ros-controls/realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: master
ros-controls/ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: master
ros-controls/ros2_controllers:
type: git
url: https://github.com/ros-controls/ros2_controllers.git
version: master
21 changes: 21 additions & 0 deletions ros_controls.rolling.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:
ros-controls/control_msgs:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: master
ros-controls/kinematics_interface:
type: git
url: https://github.com/ros-controls/kinematics_interface.git
version: master
ros-controls/realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
version: master
ros-controls/ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: master
ros-controls/ros2_controllers:
type: git
url: https://github.com/ros-controls/ros2_controllers.git
version: master

0 comments on commit dcc8df6

Please sign in to comment.