Skip to content

Commit 119b85c

Browse files
authored
Merge branch 'master' into fix/cleanup-of-chainable-controllers
2 parents 025d259 + a29fa97 commit 119b85c

100 files changed

Lines changed: 3939 additions & 622 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/kilted-pre-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
ros_distro: kilted
2626
# downstream_depth is not set on pull_request event
2727
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}
28+
prerelease_exclude_pkg: ackermann_steering_controller admittance_controller bicycle_steering_controller chained_filter_controller diff_drive_controller effort_controllers force_torque_sensor_broadcaster forward_command_controller gpio_controllers gps_sensor_broadcaster imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller mecanum_drive_controller motion_primitives_controllers omni_wheel_drive_controller parallel_gripper_controller pid_controller pose_broadcaster position_controllers range_sensor_broadcaster ros2_controllers ros2_controllers_test_nodes rqt_joint_trajectory_controller steering_controllers_library tricycle_controller tricycle_steering_controller velocity_controllers gz_ros2_control gz_ros2_control_demos gz_ros2_control_tests

.github/workflows/rolling-abi-compatibility.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control-not-released.rolling.repos'
17+
- 'ros2_control-not-released.lyrical.repos'
1718

1819
concurrency:
1920
# cancel previous runs of the same workflow, except for pushes on given branches
@@ -26,6 +27,6 @@ jobs:
2627
strategy:
2728
fail-fast: false
2829
matrix:
29-
ROS_DISTRO: [rolling]
30+
ROS_DISTRO: [lyrical, rolling]
3031
with:
3132
ros_distro: ${{ matrix.ROS_DISTRO }}

.github/workflows/rolling-binary-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
- '**/package.xml'
1818
- '**/CMakeLists.txt'
1919
- 'ros2_control-not-released.rolling.repos'
20+
- 'ros2_control-not-released.lyrical.repos'
2021
push: *event
2122
schedule:
2223
# Run every morning to detect flakiness and broken dependencies
@@ -33,7 +34,7 @@ jobs:
3334
strategy:
3435
fail-fast: false
3536
matrix:
36-
ROS_DISTRO: [rolling]
37+
ROS_DISTRO: [lyrical,rolling]
3738
ROS_REPO: [main, testing]
3839
with:
3940
ros_distro: ${{ matrix.ROS_DISTRO }}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Check Rolling Compatibility on Lyrical
2+
# author: Christoph Froehlich <christoph.froehlich@ait.ac.at>
3+
# description: 'Build & test the rolling version on Lyrical distro.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request: &event
8+
branches:
9+
- master
10+
paths:
11+
- '**.hpp'
12+
- '**.h'
13+
- '**.cpp'
14+
- '**.py'
15+
- '**.yaml'
16+
- '.github/workflows/rolling-compatibility-lyrical-binary-build.yml'
17+
- '**/package.xml'
18+
- '**/CMakeLists.txt'
19+
- 'ros2_control.rolling.repos'
20+
push: *event
21+
22+
concurrency:
23+
# cancel previous runs of the same workflow, except for pushes on given branches
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
26+
27+
jobs:
28+
build-on-lyrical:
29+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
30+
with:
31+
ros_distro: lyrical
32+
ros_repo: testing
33+
upstream_workspace: ros2_control.rolling.repos
34+
ref_for_scheduled_build: master

.github/workflows/rolling-debian-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control.rolling.repos'
17+
- 'ros2_control.lyrical.repos'
1718
push: *event
1819

1920
concurrency:
@@ -28,7 +29,7 @@ jobs:
2829
strategy:
2930
fail-fast: false
3031
matrix:
31-
ROS_DISTRO: [rolling]
32+
ROS_DISTRO: [lyrical, rolling]
3233
with:
3334
ros_distro: ${{ matrix.ROS_DISTRO }}
3435
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos

.github/workflows/rolling-pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
ROS_DISTRO: [rolling]
22+
ROS_DISTRO: [lyrical, rolling]
2323
with:
2424
ros_distro: ${{ matrix.ROS_DISTRO }}

.github/workflows/rolling-pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
ROS_DISTRO: [rolling]
26+
ROS_DISTRO: [lyrical, rolling]
2727

2828
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
2929
with:
3030
ros_distro: ${{ matrix.ROS_DISTRO }}
3131
# downstream_depth is not set on pull_request event
3232
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}
33-
prerelease_exclude_pkg: ackermann_steering_controller admittance_controller bicycle_steering_controller chained_filter_controller diff_drive_controller effort_controllers force_torque_sensor_broadcaster forward_command_controller gpio_controllers gps_sensor_broadcaster imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller mecanum_drive_controller motion_primitives_controllers omni_wheel_drive_controller parallel_gripper_controller pid_controller pose_broadcaster position_controllers range_sensor_broadcaster ros2_controllers ros2_controllers_test_nodes rqt_joint_trajectory_controller steering_controllers_library tricycle_controller tricycle_steering_controller velocity_controllers gz_ros2_control gz_ros2_control_demos gz_ros2_control_tests
33+
prerelease_exclude_pkg: ackermann_steering_controller admittance_controller bicycle_steering_controller chained_filter_controller diff_drive_controller force_torque_sensor_broadcaster forward_command_controller gpio_controllers gps_sensor_broadcaster imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller mecanum_drive_controller motion_primitives_controllers omni_wheel_drive_controller parallel_gripper_controller pid_controller pose_broadcaster range_sensor_broadcaster ros2_controllers ros2_controllers_test_nodes rqt_joint_trajectory_controller steering_controllers_library tricycle_controller tricycle_steering_controller gz_ros2_control gz_ros2_control_demos gz_ros2_control_tests

.github/workflows/rolling-rhel-binary-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- '**/package.xml'
1515
- '**/CMakeLists.txt'
1616
- 'ros2_control.rolling.repos'
17+
- 'ros2_control.lyrical.repos'
1718
push: *event
1819
concurrency:
1920
# cancel previous runs of the same workflow, except for pushes on given branches
@@ -26,7 +27,7 @@ jobs:
2627
strategy:
2728
fail-fast: false
2829
matrix:
29-
ROS_DISTRO: [rolling]
30+
ROS_DISTRO: [lyrical, rolling]
3031
with:
3132
ros_distro: ${{ matrix.ROS_DISTRO }}
3233
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos

.github/workflows/rolling-semi-binary-build-win.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- '**.py'
1515
- '**.yaml'
1616
- '.github/workflows/rolling-semi-binary-build-win.yml'
17+
- 'ros2_control.rolling.repos'
1718
- '**/package.xml'
1819
- '**/CMakeLists.txt'
1920
push: *event
@@ -29,3 +30,4 @@ jobs:
2930
with:
3031
ros_distro: rolling
3132
pixi_dependencies: typeguard jinja2 boost compilers cpp-expected
33+
upstream_workspace: ros2_control.rolling.repos

.github/workflows/rolling-semi-binary-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
- '**/package.xml'
1818
- '**/CMakeLists.txt'
1919
- 'ros2_control.rolling.repos'
20+
- 'ros2_control.lyrical.repos'
2021
push: *event
2122
schedule:
2223
# Run every morning to detect flakiness and broken dependencies
@@ -33,7 +34,7 @@ jobs:
3334
strategy:
3435
fail-fast: false
3536
matrix:
36-
ROS_DISTRO: [rolling]
37+
ROS_DISTRO: [lyrical, rolling]
3738
with:
3839
ros_distro: ${{ matrix.ROS_DISTRO }}
3940
ros_repo: testing

0 commit comments

Comments
 (0)