Merge branch 'master' into jtc/dof_independent

.github/mergify.yml

@@ -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.

.github/workflows/ci-coverage-build-humble.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].5
+      - uses: ros-tooling/[email protected].6
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -55,12 +55,12 @@ jobs:
               }
             }
           colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: codecov/codecov-action@v3.1.4
+      - uses: codecov/codecov-action@v4.0.1
         with:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: colcon-logs-coverage-humble
           path: ros_ws/log

.github/workflows/ci-coverage-build-iron.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].5
+      - uses: ros-tooling/[email protected].6
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -55,12 +55,12 @@ jobs:
               }
             }
           colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: codecov/codecov-action@v3.1.4
+      - uses: codecov/codecov-action@v4.0.1
         with:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: colcon-logs-coverage-iron
           path: ros_ws/log

.github/workflows/ci-coverage-build.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           required-ros-distributions: ${{ env.ROS_DISTRO }}
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].5
+      - uses: ros-tooling/[email protected].6
         with:
           target-ros2-distro: ${{ env.ROS_DISTRO }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
@@ -55,12 +55,12 @@ jobs:
               }
             }
           colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: codecov/codecov-action@v3.1.4
+      - uses: codecov/codecov-action@v4.0.1
         with:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: colcon-logs-coverage-rolling
           path: ros_ws/log

.github/workflows/ci-format.yml

@@ -17,6 +17,6 @@ jobs:
         python-version: '3.10'
     - name: Install system hooks
       run: sudo apt install -qq clang-format-14 cppcheck
-    - uses: pre-commit/[email protected].0
+    - uses: pre-commit/[email protected].1
       with:
         extra_args: --all-files --hook-stage manual

.github/workflows/ci-ros-lint.yml

@@ -2,6 +2,30 @@ name: ROS Lint
 on:
   pull_request:
 
+env:
+  package-name:
+    ackermann_steering_controller
+    admittance_controller
+    bicycle_steering_controller
+    diff_drive_controller
+    effort_controllers
+    force_torque_sensor_broadcaster
+    forward_command_controller
+    gripper_controllers
+    imu_sensor_broadcaster
+    joint_state_broadcaster
+    joint_trajectory_controller
+    pid_controller
+    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
+
 jobs:
   ament_lint:
     name: ament_${{ matrix.linter }}
@@ -19,28 +43,7 @@ jobs:
       with:
         distribution: rolling
         linter: ${{ matrix.linter }}
-        package-name:
-          ackermann_steering_controller
-          admittance_controller
-          bicycle_steering_controller
-          diff_drive_controller
-          effort_controllers
-          force_torque_sensor_broadcaster
-          forward_command_controller
-          gripper_controllers
-          imu_sensor_broadcaster
-          joint_state_broadcaster
-          joint_trajectory_controller
-          pid_controller
-          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
+        package-name: ${{ env.package-name }}
 
 
   ament_lint_100:
@@ -58,25 +61,4 @@ jobs:
         distribution: rolling
         linter: cpplint
         arguments: "--linelength=100 --filter=-whitespace/newline"
-        package-name:
-          ackermann_steering_controller
-          admittance_controller
-          bicycle_steering_controller
-          diff_drive_controller
-          effort_controllers
-          force_torque_sensor_broadcaster
-          forward_command_controller
-          gripper_controllers
-          imu_sensor_broadcaster
-          joint_state_broadcaster
-          joint_trajectory_controller
-          pid_controller
-          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
+        package-name: ${{ env.package-name }}

.github/workflows/humble-binary-build-main.yml → .github/workflows/humble-binary-build.yml

@@ -1,11 +1,9 @@
-name: Humble Binary Build - main
+name: Humble Binary Build
 # author: Denis Štogl <[email protected]>
 # description: 'Build & test all dependencies from released (binary) packages.'
 
 on:
   workflow_dispatch:
-    branches:
-      - humble
   pull_request:
     branches:
       - humble
@@ -18,9 +16,13 @@ on:
 
 jobs:
   binary:
-    uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_REPO: [main, testing]
     with:
       ros_distro: humble
-      ros_repo: main
+      ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.humble.repos
       ref_for_scheduled_build: humble

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

@@ -0,0 +1,20 @@
+name: Debian Humble Source Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+
+jobs:
+  humble_debian:
+    name: Humble debian build
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
+    with:
+      ros_distro: humble
+      upstream_workspace: ros2_controllers.humble.repos
+      ref_for_scheduled_build: humble
+      skip_packages: rqt_joint_trajectory_controller

.github/workflows/humble-rhel-semi-binary-build.yml

@@ -0,0 +1,19 @@
+name: RHEL Humble Binary Build
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - humble
+  schedule:
+    # Run every day to detect flakiness and broken dependencies
+    - cron: '03 1 * * *'
+
+jobs:
+  humble_rhel_binary:
+    name: Humble RHEL binary build
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
+    with:
+      ros_distro: humble
+      upstream_workspace: ros2_controllers.humble.repos
+      ref_for_scheduled_build: humble
+      skip_packages: rqt_joint_trajectory_controller