From 1076bc9062be49c0489c7c87a4d546e32f93fe9e Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 01/15] Add clang jobs

---
 .github/workflows/humble-binary-build.yml  | 11 +++++++++++
 .github/workflows/jazzy-binary-build.yml   | 11 +++++++++++
 .github/workflows/rolling-binary-build.yml | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
index a031d823cf..39100cfffb 100644
--- a/.github/workflows/humble-binary-build.yml
+++ b/.github/workflows/humble-binary-build.yml
@@ -46,3 +46,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.humble.repos
       ref_for_scheduled_build: humble
+  binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: humble
+      ros_repo: testing
+      upstream_workspace: ros2_controllers-not-released.humble.repos
+      ref_for_scheduled_build: humble
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true
diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml
index cda4969abf..8d0c33400d 100644
--- a/.github/workflows/jazzy-binary-build.yml
+++ b/.github/workflows/jazzy-binary-build.yml
@@ -47,3 +47,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.jazzy.repos
       ref_for_scheduled_build: master
+  binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: jazzy
+      ros_repo: testing
+      upstream_workspace: ros2_controllers-not-released.jazzy.repos
+      ref_for_scheduled_build: jazzy
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true
diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml
index b512eb9db7..6f0e22bb29 100644
--- a/.github/workflows/rolling-binary-build.yml
+++ b/.github/workflows/rolling-binary-build.yml
@@ -48,3 +48,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.rolling.repos
       ref_for_scheduled_build: master
+  binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: rolling
+      ros_repo: testing
+      upstream_workspace: ros2_controllers-not-released.rolling.repos
+      ref_for_scheduled_build: rolling
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true

From 7d09428340173198f16ea5b03ce19809e987d82d Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 02/15] First round of clang fixes for JTC

---
 .../include/joint_trajectory_controller/tolerances.hpp          | 2 +-
 joint_trajectory_controller/src/joint_trajectory_controller.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
index 4902fd1dcc..1583faf107 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -246,7 +246,7 @@ SegmentTolerances get_segment_tolerances(
           .c_str());
       return default_tolerances;
     }
-    auto i = std::distance(joints.cbegin(), it);
+    auto i = static_cast<size_t>(std::distance(joints.cbegin(), it));
     std::string interface = "";
     try
     {
diff --git a/joint_trajectory_controller/src/joint_trajectory_controller.cpp b/joint_trajectory_controller/src/joint_trajectory_controller.cpp
index 82d9c94aab..9096e78bf1 100644
--- a/joint_trajectory_controller/src/joint_trajectory_controller.cpp
+++ b/joint_trajectory_controller/src/joint_trajectory_controller.cpp
@@ -385,7 +385,7 @@ controller_interface::return_type JointTrajectoryController::update(
             rt_active_goal_.writeFromNonRT(RealtimeGoalHandlePtr());
             rt_has_pending_goal_.writeFromNonRT(false);
 
-            RCLCPP_WARN(logger, error_string.c_str());
+            RCLCPP_WARN(logger, "%s", error_string.c_str());
 
             traj_msg_external_point_ptr_.reset();
             traj_msg_external_point_ptr_.initRT(set_hold_position());

From d7ebd2da8a56f1424d0db09bed89a3e98d372a16 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 03/15] Add concurrency setup

---
 .github/workflows/humble-abi-compatibility.yml               | 5 +++++
 .github/workflows/humble-binary-build.yml                    | 5 +++++
 .github/workflows/humble-check-docs.yml                      | 4 ++++
 .github/workflows/humble-coverage-build.yml                  | 5 +++++
 .github/workflows/humble-debian-build.yml                    | 4 ++++
 .github/workflows/humble-pre-commit.yml                      | 4 ++++
 .github/workflows/humble-rhel-semi-binary-build.yml          | 5 +++++
 .github/workflows/humble-semi-binary-build.yml               | 5 +++++
 .github/workflows/jazzy-abi-compatibility.yml                | 5 +++++
 .github/workflows/jazzy-binary-build.yml                     | 5 +++++
 .github/workflows/jazzy-check-docs.yml                       | 4 ++++
 .github/workflows/jazzy-coverage-build.yml                   | 5 +++++
 .github/workflows/jazzy-debian-build.yml                     | 4 ++++
 .github/workflows/jazzy-pre-commit.yml                       | 4 ++++
 .github/workflows/jazzy-rhel-semi-binary-build.yml           | 4 ++++
 .github/workflows/jazzy-semi-binary-build.yml                | 5 +++++
 .github/workflows/rolling-abi-compatibility.yml              | 5 +++++
 .github/workflows/rolling-binary-build.yml                   | 5 +++++
 .github/workflows/rolling-check-docs.yml                     | 4 ++++
 .../workflows/rolling-compatibility-humble-binary-build.yml  | 5 +++++
 .../workflows/rolling-compatibility-jazzy-binary-build.yml   | 5 +++++
 .github/workflows/rolling-coverage-build.yml                 | 5 +++++
 .github/workflows/rolling-debian-build.yml                   | 4 ++++
 .github/workflows/rolling-pre-commit.yml                     | 4 ++++
 .github/workflows/rolling-rhel-semi-binary-build.yml         | 4 ++++
 .github/workflows/rolling-semi-binary-build.yml              | 5 +++++
 .github/workflows/rosdoc2.yml                                | 3 +++
 27 files changed, 122 insertions(+)

diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml
index 247371ba7d..dc78e8f073 100644
--- a/.github/workflows/humble-abi-compatibility.yml
+++ b/.github/workflows/humble-abi-compatibility.yml
@@ -15,6 +15,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.humble.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
+
 jobs:
   abi_check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
index 39100cfffb..bbd81b6638 100644
--- a/.github/workflows/humble-binary-build.yml
+++ b/.github/workflows/humble-binary-build.yml
@@ -34,6 +34,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
+
 jobs:
   binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/humble-check-docs.yml b/.github/workflows/humble-check-docs.yml
index 0eeeaedf40..448ff4084b 100644
--- a/.github/workflows/humble-check-docs.yml
+++ b/.github/workflows/humble-check-docs.yml
@@ -10,6 +10,10 @@ on:
       - '**.md'
       - '**.yaml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-docs:
     name: Check Docs
diff --git a/.github/workflows/humble-coverage-build.yml b/.github/workflows/humble-coverage-build.yml
index d0dcb9c350..54384bb9f0 100644
--- a/.github/workflows/humble-coverage-build.yml
+++ b/.github/workflows/humble-coverage-build.yml
@@ -30,6 +30,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.humble.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
+
 jobs:
   coverage_humble:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
index cd25248caf..c6204729cb 100644
--- a/.github/workflows/humble-debian-build.yml
+++ b/.github/workflows/humble-debian-build.yml
@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
 
 jobs:
   humble_debian:
diff --git a/.github/workflows/humble-pre-commit.yml b/.github/workflows/humble-pre-commit.yml
index 5bb2408578..38a76ee025 100644
--- a/.github/workflows/humble-pre-commit.yml
+++ b/.github/workflows/humble-pre-commit.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - humble
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
diff --git a/.github/workflows/humble-rhel-semi-binary-build.yml b/.github/workflows/humble-rhel-semi-binary-build.yml
index 25c755ada5..3b2ba40179 100644
--- a/.github/workflows/humble-rhel-semi-binary-build.yml
+++ b/.github/workflows/humble-rhel-semi-binary-build.yml
@@ -18,6 +18,11 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
+
 jobs:
   humble_rhel_binary:
     name: Humble RHEL binary build
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
index c53c46032a..b2c1ebb15e 100644
--- a/.github/workflows/humble-semi-binary-build.yml
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -33,6 +33,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on humble branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'humble' }}
+
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/jazzy-abi-compatibility.yml b/.github/workflows/jazzy-abi-compatibility.yml
index 8e557b5ee3..00b2eef010 100644
--- a/.github/workflows/jazzy-abi-compatibility.yml
+++ b/.github/workflows/jazzy-abi-compatibility.yml
@@ -14,6 +14,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.jazzy.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   abi_check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml
index 8d0c33400d..7c3e89583b 100644
--- a/.github/workflows/jazzy-binary-build.yml
+++ b/.github/workflows/jazzy-binary-build.yml
@@ -35,6 +35,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/jazzy-check-docs.yml b/.github/workflows/jazzy-check-docs.yml
index 2f9eaf18bd..cfc67a3eac 100644
--- a/.github/workflows/jazzy-check-docs.yml
+++ b/.github/workflows/jazzy-check-docs.yml
@@ -10,6 +10,10 @@ on:
       - '**.md'
       - '**.yaml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-docs:
     name: Check Docs
diff --git a/.github/workflows/jazzy-coverage-build.yml b/.github/workflows/jazzy-coverage-build.yml
index c96ac88c32..3cec3883b2 100644
--- a/.github/workflows/jazzy-coverage-build.yml
+++ b/.github/workflows/jazzy-coverage-build.yml
@@ -33,6 +33,11 @@ on:
   #     - '**/CMakeLists.txt'
   #     - 'ros2_controllers.jazzy.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   coverage_jazzy:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
diff --git a/.github/workflows/jazzy-debian-build.yml b/.github/workflows/jazzy-debian-build.yml
index e3e3b8a353..620877c1ea 100644
--- a/.github/workflows/jazzy-debian-build.yml
+++ b/.github/workflows/jazzy-debian-build.yml
@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
 
 jobs:
   jazzy_debian:
diff --git a/.github/workflows/jazzy-pre-commit.yml b/.github/workflows/jazzy-pre-commit.yml
index d9ec610bbc..aab5ba52ac 100644
--- a/.github/workflows/jazzy-pre-commit.yml
+++ b/.github/workflows/jazzy-pre-commit.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
diff --git a/.github/workflows/jazzy-rhel-semi-binary-build.yml b/.github/workflows/jazzy-rhel-semi-binary-build.yml
index 1c62fcf2ac..dba2955cb1 100644
--- a/.github/workflows/jazzy-rhel-semi-binary-build.yml
+++ b/.github/workflows/jazzy-rhel-semi-binary-build.yml
@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
 
 jobs:
   jazzy_rhel:
diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml
index a462d9040a..76bf303dda 100644
--- a/.github/workflows/jazzy-semi-binary-build.yml
+++ b/.github/workflows/jazzy-semi-binary-build.yml
@@ -35,6 +35,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
index da3337554c..dc0717c832 100644
--- a/.github/workflows/rolling-abi-compatibility.yml
+++ b/.github/workflows/rolling-abi-compatibility.yml
@@ -14,6 +14,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers-not-released.rolling.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   abi_check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml
index 6f0e22bb29..dbe78dfa3d 100644
--- a/.github/workflows/rolling-binary-build.yml
+++ b/.github/workflows/rolling-binary-build.yml
@@ -36,6 +36,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/rolling-check-docs.yml b/.github/workflows/rolling-check-docs.yml
index 15b7eff57e..1144c4e6c0 100644
--- a/.github/workflows/rolling-check-docs.yml
+++ b/.github/workflows/rolling-check-docs.yml
@@ -11,6 +11,10 @@ on:
       - '**.yaml'
       - '.github/workflows/rolling-check-docs.yml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-docs:
     name: Check Docs
diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml
index 7aab02fa62..c437ff9aac 100644
--- a/.github/workflows/rolling-compatibility-humble-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml
@@ -33,6 +33,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.rolling.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   build-on-humble:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
index 37ffbb84a4..d244fb6b3b 100644
--- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
@@ -33,6 +33,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.rolling.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   build-on-jazzy:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml
index 058ff9bb33..ff5c006d52 100644
--- a/.github/workflows/rolling-coverage-build.yml
+++ b/.github/workflows/rolling-coverage-build.yml
@@ -30,6 +30,11 @@ on:
       - '**/CMakeLists.txt'
       - 'ros2_controllers.rolling.repos'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   coverage_rolling:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml
index d7efd3ea0a..e2ef234810 100644
--- a/.github/workflows/rolling-debian-build.yml
+++ b/.github/workflows/rolling-debian-build.yml
@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
 
 jobs:
   rolling_debian:
diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml
index 7bc07ba802..792278d6d2 100644
--- a/.github/workflows/rolling-pre-commit.yml
+++ b/.github/workflows/rolling-pre-commit.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml
index 29a53b810a..d821b9323a 100644
--- a/.github/workflows/rolling-rhel-semi-binary-build.yml
+++ b/.github/workflows/rolling-rhel-semi-binary-build.yml
@@ -18,6 +18,10 @@ on:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
 
 jobs:
   rolling_rhel:
diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
index db0dd1fe64..e8f51beb5d 100644
--- a/.github/workflows/rolling-semi-binary-build.yml
+++ b/.github/workflows/rolling-semi-binary-build.yml
@@ -35,6 +35,11 @@ on:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
 
+concurrency:
+  # cancel previous runs of the same workflow, except for pushes on master branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'master' }}
+
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
diff --git a/.github/workflows/rosdoc2.yml b/.github/workflows/rosdoc2.yml
index 0771248e79..434344fcaa 100644
--- a/.github/workflows/rosdoc2.yml
+++ b/.github/workflows/rosdoc2.yml
@@ -8,6 +8,9 @@ on:
       - ros2_controllers/rosdoc2.yaml
       - ros2_controllers/package.xml
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check:

From b140fd3f226f1a22389b0885166eae69b3a5aaef Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 04/15] Test clang in semi-binary builds

---
 .github/workflows/humble-binary-build.yml       | 11 -----------
 .github/workflows/humble-semi-binary-build.yml  | 11 +++++++++++
 .github/workflows/jazzy-binary-build.yml        | 11 -----------
 .github/workflows/jazzy-semi-binary-build.yml   | 11 +++++++++++
 .github/workflows/rolling-binary-build.yml      | 11 -----------
 .github/workflows/rolling-semi-binary-build.yml | 11 +++++++++++
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
index bbd81b6638..6372e918b5 100644
--- a/.github/workflows/humble-binary-build.yml
+++ b/.github/workflows/humble-binary-build.yml
@@ -51,14 +51,3 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.humble.repos
       ref_for_scheduled_build: humble
-  binary_clang:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    with:
-      ros_distro: humble
-      ros_repo: testing
-      upstream_workspace: ros2_controllers-not-released.humble.repos
-      ref_for_scheduled_build: humble
-      additional_debs: clang
-      c_compiler: clang
-      cxx_compiler: clang++
-      not_test_build: true
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
index b2c1ebb15e..a9ac0cf368 100644
--- a/.github/workflows/humble-semi-binary-build.yml
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -50,3 +50,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers.humble.repos
       ref_for_scheduled_build: humble
+  semi_binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: humble
+      ros_repo: testing
+      upstream_workspace: ros2_controllers-not-released.humble.repos
+      ref_for_scheduled_build: humble
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true
diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml
index 7c3e89583b..83799acc67 100644
--- a/.github/workflows/jazzy-binary-build.yml
+++ b/.github/workflows/jazzy-binary-build.yml
@@ -52,14 +52,3 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.jazzy.repos
       ref_for_scheduled_build: master
-  binary_clang:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    with:
-      ros_distro: jazzy
-      ros_repo: testing
-      upstream_workspace: ros2_controllers-not-released.jazzy.repos
-      ref_for_scheduled_build: jazzy
-      additional_debs: clang
-      c_compiler: clang
-      cxx_compiler: clang++
-      not_test_build: true
diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml
index 76bf303dda..9b78df6109 100644
--- a/.github/workflows/jazzy-semi-binary-build.yml
+++ b/.github/workflows/jazzy-semi-binary-build.yml
@@ -52,3 +52,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers.jazzy.repos
       ref_for_scheduled_build: master
+  semi_binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: jazzy
+      ros_repo: testing
+      upstream_workspace: ros2_controllers.jazzy.repos
+      ref_for_scheduled_build: jazzy
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true
diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml
index dbe78dfa3d..d806b91c4e 100644
--- a/.github/workflows/rolling-binary-build.yml
+++ b/.github/workflows/rolling-binary-build.yml
@@ -53,14 +53,3 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers-not-released.rolling.repos
       ref_for_scheduled_build: master
-  binary_clang:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    with:
-      ros_distro: rolling
-      ros_repo: testing
-      upstream_workspace: ros2_controllers-not-released.rolling.repos
-      ref_for_scheduled_build: rolling
-      additional_debs: clang
-      c_compiler: clang
-      cxx_compiler: clang++
-      not_test_build: true
diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
index e8f51beb5d..13d159dd14 100644
--- a/.github/workflows/rolling-semi-binary-build.yml
+++ b/.github/workflows/rolling-semi-binary-build.yml
@@ -52,3 +52,14 @@ jobs:
       ros_repo: ${{ matrix.ROS_REPO }}
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
+  semi_binary_clang:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    with:
+      ros_distro: rolling
+      ros_repo: testing
+      upstream_workspace: ros2_controllers.rolling.repos
+      ref_for_scheduled_build: rolling
+      additional_debs: clang
+      c_compiler: clang
+      cxx_compiler: clang++
+      not_test_build: true

From 06f6cd008e00d728dc6deb1536234ca5081cef4c Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 05/15] Temporarily add ros2_control  clang fix

---
 ros2_controllers.jazzy.repos   | 2 +-
 ros2_controllers.rolling.repos | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ros2_controllers.jazzy.repos b/ros2_controllers.jazzy.repos
index 8c20eccc96..9428dbd2ce 100644
--- a/ros2_controllers.jazzy.repos
+++ b/ros2_controllers.jazzy.repos
@@ -2,7 +2,7 @@ repositories:
   ros2_control:
     type: git
     url: https://github.com/ros-controls/ros2_control.git
-    version: master
+    version: ci/clang
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git
diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos
index 8c20eccc96..9428dbd2ce 100644
--- a/ros2_controllers.rolling.repos
+++ b/ros2_controllers.rolling.repos
@@ -2,7 +2,7 @@ repositories:
   ros2_control:
     type: git
     url: https://github.com/ros-controls/ros2_control.git
-    version: master
+    version: ci/clang
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git

From 8e4589d5d9b6335e63f0756546d859f0957306e5 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 06/15] Use humble version for realtime_tools

---
 ros2_controllers.humble.repos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ros2_controllers.humble.repos b/ros2_controllers.humble.repos
index a0432f65b3..548c95b44a 100644
--- a/ros2_controllers.humble.repos
+++ b/ros2_controllers.humble.repos
@@ -6,7 +6,7 @@ repositories:
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git
-    version: master
+    version: humble
   kinematics_interface:
     type: git
     url: https://github.com/ros-controls/kinematics_interface.git

From 25ec991f31ad39fa5392c6ad0d37490939d56200 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 21:31:39 +0000
Subject: [PATCH 07/15] Temporarily add control_tb  clang fix

---
 ros2_controllers.jazzy.repos   | 2 +-
 ros2_controllers.rolling.repos | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ros2_controllers.jazzy.repos b/ros2_controllers.jazzy.repos
index 9428dbd2ce..49b409b2c7 100644
--- a/ros2_controllers.jazzy.repos
+++ b/ros2_controllers.jazzy.repos
@@ -14,7 +14,7 @@ repositories:
   control_toolbox:
     type: git
     url: https://github.com/ros-controls/control_toolbox.git
-    version: ros2-master
+    version: ci/clang
   kinematics_interface:
     type: git
     url: https://github.com/ros-controls/kinematics_interface.git
diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos
index 9428dbd2ce..49b409b2c7 100644
--- a/ros2_controllers.rolling.repos
+++ b/ros2_controllers.rolling.repos
@@ -14,7 +14,7 @@ repositories:
   control_toolbox:
     type: git
     url: https://github.com/ros-controls/control_toolbox.git
-    version: ros2-master
+    version: ci/clang
   kinematics_interface:
     type: git
     url: https://github.com/ros-controls/kinematics_interface.git

From 35abc6c7fceb06bcfec36789d50eddff32358f5e Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 22:10:00 +0000
Subject: [PATCH 08/15] Satisfy clang more

---
 diff_drive_controller/src/diff_drive_controller.cpp            | 2 +-
 .../src/steering_controllers_library.cpp                       | 3 ++-
 tricycle_controller/src/tricycle_controller.cpp                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/diff_drive_controller/src/diff_drive_controller.cpp b/diff_drive_controller/src/diff_drive_controller.cpp
index d710c81257..a93d3d3812 100644
--- a/diff_drive_controller/src/diff_drive_controller.cpp
+++ b/diff_drive_controller/src/diff_drive_controller.cpp
@@ -292,7 +292,7 @@ controller_interface::CallbackReturn DiffDriveController::on_configure(
   const double right_wheel_radius = params_.right_wheel_radius_multiplier * params_.wheel_radius;
 
   odometry_.setWheelParams(wheel_separation, left_wheel_radius, right_wheel_radius);
-  odometry_.setVelocityRollingWindowSize(params_.velocity_rolling_window_size);
+  odometry_.setVelocityRollingWindowSize(static_cast<size_t>(params_.velocity_rolling_window_size));
 
   cmd_vel_timeout_ = std::chrono::milliseconds{static_cast<int>(params_.cmd_vel_timeout * 1000.0)};
   publish_limited_velocity_ = params_.publish_limited_velocity;
diff --git a/steering_controllers_library/src/steering_controllers_library.cpp b/steering_controllers_library/src/steering_controllers_library.cpp
index 836574f150..3c14013f40 100644
--- a/steering_controllers_library/src/steering_controllers_library.cpp
+++ b/steering_controllers_library/src/steering_controllers_library.cpp
@@ -81,7 +81,8 @@ controller_interface::CallbackReturn SteeringControllersLibrary::on_configure(
   const rclcpp_lifecycle::State & /*previous_state*/)
 {
   params_ = param_listener_->get_params();
-  odometry_.set_velocity_rolling_window_size(params_.velocity_rolling_window_size);
+  odometry_.set_velocity_rolling_window_size(
+    static_cast<size_t>(params_.velocity_rolling_window_size));
 
   configure_odometry();
 
diff --git a/tricycle_controller/src/tricycle_controller.cpp b/tricycle_controller/src/tricycle_controller.cpp
index 1d6daba958..bc04451ad6 100644
--- a/tricycle_controller/src/tricycle_controller.cpp
+++ b/tricycle_controller/src/tricycle_controller.cpp
@@ -236,7 +236,7 @@ CallbackReturn TricycleController::on_configure(const rclcpp_lifecycle::State &
   }
 
   odometry_.setWheelParams(params_.wheelbase, params_.wheel_radius);
-  odometry_.setVelocityRollingWindowSize(params_.velocity_rolling_window_size);
+  odometry_.setVelocityRollingWindowSize(static_cast<size_t>(params_.velocity_rolling_window_size));
 
   cmd_vel_timeout_ = std::chrono::milliseconds{params_.cmd_vel_timeout};
   params_.publish_ackermann_command =

From 5d68ee8dfa9f9d732fd47abc7d3b7243257ca6e8 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 22:18:32 +0000
Subject: [PATCH 09/15] Remove matrix

---
 .github/workflows/humble-semi-binary-build.yml           | 6 +-----
 .github/workflows/jazzy-semi-binary-build.yml            | 6 +-----
 .../rolling-compatibility-humble-binary-build.yml        | 9 ++-------
 .../rolling-compatibility-jazzy-binary-build.yml         | 9 ++-------
 .github/workflows/rolling-semi-binary-build.yml          | 6 +-----
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
index a9ac0cf368..8be0d8d145 100644
--- a/.github/workflows/humble-semi-binary-build.yml
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -41,13 +41,9 @@ concurrency:
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_REPO: [testing]
     with:
       ros_distro: humble
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_repo: testing
       upstream_workspace: ros2_controllers.humble.repos
       ref_for_scheduled_build: humble
   semi_binary_clang:
diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml
index 9b78df6109..fcf1346f26 100644
--- a/.github/workflows/jazzy-semi-binary-build.yml
+++ b/.github/workflows/jazzy-semi-binary-build.yml
@@ -43,13 +43,9 @@ concurrency:
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_REPO: [testing]
     with:
       ros_distro: jazzy
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_repo: testing
       upstream_workspace: ros2_controllers.jazzy.repos
       ref_for_scheduled_build: master
   semi_binary_clang:
diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml
index c437ff9aac..9b01c21f01 100644
--- a/.github/workflows/rolling-compatibility-humble-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml
@@ -41,13 +41,8 @@ concurrency:
 jobs:
   build-on-humble:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [humble]
-        ROS_REPO: [testing]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_distro: humble
+      ros_repo: testing
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
index d244fb6b3b..de78374f0b 100644
--- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
@@ -41,13 +41,8 @@ concurrency:
 jobs:
   build-on-jazzy:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_DISTRO: [jazzy]
-        ROS_REPO: [testing]
     with:
-      ros_distro: ${{ matrix.ROS_DISTRO }}
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_distro: jazzy
+      ros_repo: testing
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
index 13d159dd14..7de1f42bb3 100644
--- a/.github/workflows/rolling-semi-binary-build.yml
+++ b/.github/workflows/rolling-semi-binary-build.yml
@@ -43,13 +43,9 @@ concurrency:
 jobs:
   semi_binary:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
-    strategy:
-      fail-fast: false
-      matrix:
-        ROS_REPO: [testing]
     with:
       ros_distro: rolling
-      ros_repo: ${{ matrix.ROS_REPO }}
+      ros_repo: testing
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
   semi_binary_clang:

From 627b0fde67191cab570707c032bea38e2c1a8455 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Dec 2024 22:31:50 +0000
Subject: [PATCH 10/15] Fix cm construction

---
 .../test/test_load_forward_command_controller.cpp               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forward_command_controller/test/test_load_forward_command_controller.cpp b/forward_command_controller/test/test_load_forward_command_controller.cpp
index c192f1eb5f..ad2e53162a 100644
--- a/forward_command_controller/test/test_load_forward_command_controller.cpp
+++ b/forward_command_controller/test/test_load_forward_command_controller.cpp
@@ -30,7 +30,7 @@ TEST(TestLoadForwardCommandController, load_controller)
     std::make_shared<rclcpp::executors::SingleThreadedExecutor>();
 
   controller_manager::ControllerManager cm(
-    executor, ros2_control_test_assets::minimal_robot_urdf, "test_controller_manager");
+    executor, ros2_control_test_assets::minimal_robot_urdf, true, "test_controller_manager");
 
   ASSERT_NE(
     cm.load_controller(

From 367ed26ca8fb31b74ff0b8d263d37d7ae778fe36 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Thu, 5 Dec 2024 20:55:50 +0000
Subject: [PATCH 11/15] Satisfy clang even more

---
 .../admittance_controller/admittance_rule.hpp |  9 ++---
 .../admittance_rule_impl.hpp                  | 35 +++++++++++--------
 .../src/admittance_controller.cpp             |  4 +--
 .../test/test_joint_state_broadcaster.cpp     |  4 +--
 .../tolerances.hpp                            |  2 +-
 .../trajectory.hpp                            |  4 +--
 .../src/joint_trajectory_controller.cpp       |  4 +--
 .../src/trajectory.cpp                        |  4 +--
 .../test/test_trajectory_controller_utils.hpp |  3 +-
 pid_controller/src/pid_controller.cpp         |  2 +-
 .../src/steering_odometry.cpp                 |  5 ++-
 11 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/admittance_controller/include/admittance_controller/admittance_rule.hpp b/admittance_controller/include/admittance_controller/admittance_rule.hpp
index a326b663d0..bfb3a612c7 100644
--- a/admittance_controller/include/admittance_controller/admittance_rule.hpp
+++ b/admittance_controller/include/admittance_controller/admittance_rule.hpp
@@ -63,10 +63,11 @@ struct AdmittanceState
     mass_inv.setZero();
     stiffness.setZero();
     selected_axes.setZero();
-    current_joint_pos = Eigen::VectorXd::Zero(num_joints);
-    joint_pos = Eigen::VectorXd::Zero(num_joints);
-    joint_vel = Eigen::VectorXd::Zero(num_joints);
-    joint_acc = Eigen::VectorXd::Zero(num_joints);
+    auto idx = static_cast<Eigen::Index>(num_joints);
+    current_joint_pos = Eigen::VectorXd::Zero(idx);
+    joint_pos = Eigen::VectorXd::Zero(idx);
+    joint_vel = Eigen::VectorXd::Zero(idx);
+    joint_acc = Eigen::VectorXd::Zero(idx);
   }
 
   Eigen::VectorXd current_joint_pos;
diff --git a/admittance_controller/include/admittance_controller/admittance_rule_impl.hpp b/admittance_controller/include/admittance_controller/admittance_rule_impl.hpp
index 13d4e67fbc..859c7e3336 100644
--- a/admittance_controller/include/admittance_controller/admittance_rule_impl.hpp
+++ b/admittance_controller/include/admittance_controller/admittance_rule_impl.hpp
@@ -136,9 +136,11 @@ void AdmittanceRule::apply_parameters_update()
 
   for (size_t i = 0; i < NUM_CARTESIAN_DOF; ++i)
   {
-    admittance_state_.mass_inv[i] = 1.0 / parameters_.admittance.mass[i];
-    admittance_state_.damping[i] = parameters_.admittance.damping_ratio[i] * 2 *
-                                   sqrt(admittance_state_.mass[i] * admittance_state_.stiffness[i]);
+    auto idx = static_cast<Eigen::Index>(i);
+    admittance_state_.mass_inv[idx] = 1.0 / parameters_.admittance.mass[i];
+    admittance_state_.damping[idx] =
+      parameters_.admittance.damping_ratio[i] * 2 *
+      sqrt(admittance_state_.mass[idx] * admittance_state_.stiffness[idx]);
   }
 }
 
@@ -216,12 +218,13 @@ controller_interface::return_type AdmittanceRule::update(
   // update joint desired joint state
   for (size_t i = 0; i < num_joints_; ++i)
   {
+    auto idx = static_cast<Eigen::Index>(i);
     desired_joint_state.positions[i] =
-      reference_joint_state.positions[i] + admittance_state_.joint_pos[i];
+      reference_joint_state.positions[i] + admittance_state_.joint_pos[idx];
     desired_joint_state.velocities[i] =
-      reference_joint_state.velocities[i] + admittance_state_.joint_vel[i];
+      reference_joint_state.velocities[i] + admittance_state_.joint_vel[idx];
     desired_joint_state.accelerations[i] =
-      reference_joint_state.accelerations[i] + admittance_state_.joint_acc[i];
+      reference_joint_state.accelerations[i] + admittance_state_.joint_acc[idx];
   }
 
   return controller_interface::return_type::OK;
@@ -334,7 +337,7 @@ void AdmittanceRule::process_wrench_measurements(
   new_wrench_base.block<3, 1>(0, 1) -= (cog_world_rot * cog_pos_).cross(end_effector_weight_);
 
   // apply smoothing filter
-  for (size_t i = 0; i < 6; ++i)
+  for (Eigen::Index i = 0; i < 6; ++i)
   {
     wrench_world_(i) = filters::exponentialSmoothing(
       new_wrench_base(i), wrench_world_(i), parameters_.ft_sensor.filter_coefficient);
@@ -345,18 +348,20 @@ const control_msgs::msg::AdmittanceControllerState & AdmittanceRule::get_control
 {
   for (size_t i = 0; i < NUM_CARTESIAN_DOF; ++i)
   {
-    state_message_.stiffness.data[i] = admittance_state_.stiffness[i];
-    state_message_.damping.data[i] = admittance_state_.damping[i];
-    state_message_.selected_axes.data[i] = static_cast<bool>(admittance_state_.selected_axes[i]);
-    state_message_.mass.data[i] = admittance_state_.mass[i];
+    auto idx = static_cast<Eigen::Index>(i);
+    state_message_.stiffness.data[i] = admittance_state_.stiffness[idx];
+    state_message_.damping.data[i] = admittance_state_.damping[idx];
+    state_message_.selected_axes.data[i] = static_cast<bool>(admittance_state_.selected_axes[idx]);
+    state_message_.mass.data[i] = admittance_state_.mass[idx];
   }
 
   for (size_t i = 0; i < parameters_.joints.size(); ++i)
   {
+    auto idx = static_cast<Eigen::Index>(i);
     state_message_.joint_state.name[i] = parameters_.joints[i];
-    state_message_.joint_state.position[i] = admittance_state_.joint_pos[i];
-    state_message_.joint_state.velocity[i] = admittance_state_.joint_vel[i];
-    state_message_.joint_state.effort[i] = admittance_state_.joint_acc[i];
+    state_message_.joint_state.position[i] = admittance_state_.joint_pos[idx];
+    state_message_.joint_state.velocity[i] = admittance_state_.joint_vel[idx];
+    state_message_.joint_state.effort[i] = admittance_state_.joint_acc[idx];
   }
 
   state_message_.wrench_base.wrench.force.x = admittance_state_.wrench_base[0];
@@ -411,7 +416,7 @@ void AdmittanceRule::vec_to_eigen(const std::vector<T1> & data, T2 & matrix)
   {
     for (auto row = 0; row < matrix.rows(); row++)
     {
-      matrix(row, col) = data[row + col * matrix.rows()];
+      matrix(row, col) = data[static_cast<size_t>(row + col * matrix.rows())];
     }
   }
 }
diff --git a/admittance_controller/src/admittance_controller.cpp b/admittance_controller/src/admittance_controller.cpp
index 6e0e38140a..333d6ffded 100644
--- a/admittance_controller/src/admittance_controller.cpp
+++ b/admittance_controller/src/admittance_controller.cpp
@@ -304,7 +304,7 @@ controller_interface::CallbackReturn AdmittanceController::on_activate(
   {
     auto it =
       std::find(allowed_interface_types_.begin(), allowed_interface_types_.end(), interface);
-    auto index = std::distance(allowed_interface_types_.begin(), it);
+    auto index = static_cast<size_t>(std::distance(allowed_interface_types_.begin(), it));
     if (!controller_interface::get_ordered_interfaces(
           state_interfaces_, admittance_->parameters_.joints, interface,
           joint_state_interface_[index]))
@@ -319,7 +319,7 @@ controller_interface::CallbackReturn AdmittanceController::on_activate(
   {
     auto it =
       std::find(allowed_interface_types_.begin(), allowed_interface_types_.end(), interface);
-    auto index = std::distance(allowed_interface_types_.begin(), it);
+    auto index = static_cast<size_t>(std::distance(allowed_interface_types_.begin(), it));
     if (!controller_interface::get_ordered_interfaces(
           command_interfaces_, command_joint_names_, interface, joint_command_interface_[index]))
     {
diff --git a/joint_state_broadcaster/test/test_joint_state_broadcaster.cpp b/joint_state_broadcaster/test/test_joint_state_broadcaster.cpp
index de534c00b6..3ec7ff4ac2 100644
--- a/joint_state_broadcaster/test/test_joint_state_broadcaster.cpp
+++ b/joint_state_broadcaster/test/test_joint_state_broadcaster.cpp
@@ -1091,10 +1091,10 @@ void JointStateBroadcasterTest::test_published_dynamic_joint_state_message(
     ASSERT_THAT(
       dynamic_joint_state_msg->interface_values[i].interface_names,
       ElementsAreArray(INTERFACE_NAMES));
-    const auto index_in_original_order = std::distance(
+    const auto index_in_original_order = static_cast<size_t>(std::distance(
       joint_names_.cbegin(),
       std::find(
-        joint_names_.cbegin(), joint_names_.cend(), dynamic_joint_state_msg->joint_names[i]));
+        joint_names_.cbegin(), joint_names_.cend(), dynamic_joint_state_msg->joint_names[i])));
     ASSERT_THAT(
       dynamic_joint_state_msg->interface_values[i].values,
       Each(joint_values_[index_in_original_order]));
diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
index 1583faf107..b33a2bf5c5 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -199,7 +199,7 @@ SegmentTolerances get_segment_tolerances(
           .c_str());
       return default_tolerances;
     }
-    auto i = std::distance(joints.cbegin(), it);
+    auto i = static_cast<size_t>(std::distance(joints.cbegin(), it));
     std::string interface = "";
     try
     {
diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp
index d650c369d0..74d4e28f3a 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp
@@ -206,8 +206,8 @@ inline std::vector<size_t> mapping(const T & t1, const T & t2)
     }
     else
     {
-      const size_t t1_dist = std::distance(t1.begin(), t1_it);
-      const size_t t2_dist = std::distance(t2.begin(), t2_it);
+      const size_t t1_dist = static_cast<size_t>(std::distance(t1.begin(), t1_it));
+      const size_t t2_dist = static_cast<size_t>(std::distance(t2.begin(), t2_it));
       mapping_vector[t1_dist] = t2_dist;
     }
   }
diff --git a/joint_trajectory_controller/src/joint_trajectory_controller.cpp b/joint_trajectory_controller/src/joint_trajectory_controller.cpp
index 9096e78bf1..365ce993d0 100644
--- a/joint_trajectory_controller/src/joint_trajectory_controller.cpp
+++ b/joint_trajectory_controller/src/joint_trajectory_controller.cpp
@@ -907,7 +907,7 @@ controller_interface::CallbackReturn JointTrajectoryController::on_activate(
   {
     auto it =
       std::find(allowed_interface_types_.begin(), allowed_interface_types_.end(), interface);
-    auto index = std::distance(allowed_interface_types_.begin(), it);
+    auto index = static_cast<size_t>(std::distance(allowed_interface_types_.begin(), it));
     if (!controller_interface::get_ordered_interfaces(
           command_interfaces_, command_joint_names_, interface, joint_command_interface_[index]))
     {
@@ -921,7 +921,7 @@ controller_interface::CallbackReturn JointTrajectoryController::on_activate(
   {
     auto it =
       std::find(allowed_interface_types_.begin(), allowed_interface_types_.end(), interface);
-    auto index = std::distance(allowed_interface_types_.begin(), it);
+    auto index = static_cast<size_t>(std::distance(allowed_interface_types_.begin(), it));
     if (!controller_interface::get_ordered_interfaces(
           state_interfaces_, params_.joints, interface, joint_state_interface_[index]))
     {
diff --git a/joint_trajectory_controller/src/trajectory.cpp b/joint_trajectory_controller/src/trajectory.cpp
index 1c50d26c62..f91eb3e9d9 100644
--- a/joint_trajectory_controller/src/trajectory.cpp
+++ b/joint_trajectory_controller/src/trajectory.cpp
@@ -175,8 +175,8 @@ bool Trajectory::sample(
 
         interpolate_between_points(t0, point, t1, next_point, sample_time, output_state);
       }
-      start_segment_itr = begin() + i;
-      end_segment_itr = begin() + (i + 1);
+      start_segment_itr = begin() + static_cast<std::ptrdiff_t>(i);
+      end_segment_itr = begin() + static_cast<std::ptrdiff_t>(i + 1);
       if (search_monotonically_increasing)
       {
         last_sample_idx_ = i;
diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
index 7dff81f08f..656bed11d5 100644
--- a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
+++ b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@@ -467,7 +467,8 @@ class TrajectoryControllerTest : public ::testing::Test
     if (joint_names.empty())
     {
       traj_msg.joint_names = {
-        joint_names_.begin(), joint_names_.begin() + points_positions[0].size()};
+        joint_names_.begin(),
+        joint_names_.begin() + static_cast<std::ptrdiff_t>(points_positions[0].size())};
     }
     else
     {
diff --git a/pid_controller/src/pid_controller.cpp b/pid_controller/src/pid_controller.cpp
index 032dc1d666..f3b2ba33a0 100644
--- a/pid_controller/src/pid_controller.cpp
+++ b/pid_controller/src/pid_controller.cpp
@@ -320,7 +320,7 @@ void PidController::reference_callback(const std::shared_ptr<ControllerReference
         break;
       }
 
-      auto position = std::distance(ref_msg->dof_names.begin(), found_it);
+      auto position = static_cast<size_t>(std::distance(ref_msg->dof_names.begin(), found_it));
       ref_msg->values[position] = msg->values[i];
       ref_msg->values_dot[position] = msg->values_dot[i];
     }
diff --git a/steering_controllers_library/src/steering_odometry.cpp b/steering_controllers_library/src/steering_odometry.cpp
index dbe210ed41..8b8bb8bfd8 100644
--- a/steering_controllers_library/src/steering_odometry.cpp
+++ b/steering_controllers_library/src/steering_odometry.cpp
@@ -204,7 +204,10 @@ void SteeringOdometry::set_velocity_rolling_window_size(size_t velocity_rolling_
   reset_accumulators();
 }
 
-void SteeringOdometry::set_odometry_type(const unsigned int type) { config_type_ = type; }
+void SteeringOdometry::set_odometry_type(const unsigned int type)
+{
+  config_type_ = static_cast<int>(type);
+}
 
 double SteeringOdometry::convert_twist_to_steering_angle(double v_bx, double omega_bz)
 {

From 0b02d36ba93daee65e83ed2ba5668e88bde74b61 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Thu, 5 Dec 2024 21:09:00 +0000
Subject: [PATCH 12/15] Don't hardcode branch in setting

---
 .github/workflows/humble-abi-compatibility.yml                  | 2 +-
 .github/workflows/humble-binary-build.yml                       | 2 +-
 .github/workflows/humble-coverage-build.yml                     | 2 +-
 .github/workflows/humble-debian-build.yml                       | 2 +-
 .github/workflows/humble-rhel-semi-binary-build.yml             | 2 +-
 .github/workflows/humble-semi-binary-build.yml                  | 2 +-
 .github/workflows/jazzy-abi-compatibility.yml                   | 2 +-
 .github/workflows/jazzy-binary-build.yml                        | 2 +-
 .github/workflows/jazzy-coverage-build.yml                      | 2 +-
 .github/workflows/jazzy-debian-build.yml                        | 2 +-
 .github/workflows/jazzy-rhel-semi-binary-build.yml              | 2 +-
 .github/workflows/jazzy-semi-binary-build.yml                   | 2 +-
 .github/workflows/rolling-abi-compatibility.yml                 | 2 +-
 .github/workflows/rolling-binary-build.yml                      | 2 +-
 .github/workflows/rolling-compatibility-humble-binary-build.yml | 2 +-
 .github/workflows/rolling-compatibility-jazzy-binary-build.yml  | 2 +-
 .github/workflows/rolling-coverage-build.yml                    | 2 +-
 .github/workflows/rolling-debian-build.yml                      | 2 +-
 .github/workflows/rolling-rhel-semi-binary-build.yml            | 2 +-
 .github/workflows/rolling-semi-binary-build.yml                 | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml
index dc78e8f073..6cfd2c6068 100644
--- a/.github/workflows/humble-abi-compatibility.yml
+++ b/.github/workflows/humble-abi-compatibility.yml
@@ -18,7 +18,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   abi_check:
diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml
index 6372e918b5..f013f18880 100644
--- a/.github/workflows/humble-binary-build.yml
+++ b/.github/workflows/humble-binary-build.yml
@@ -37,7 +37,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   binary:
diff --git a/.github/workflows/humble-coverage-build.yml b/.github/workflows/humble-coverage-build.yml
index 54384bb9f0..40d1de7052 100644
--- a/.github/workflows/humble-coverage-build.yml
+++ b/.github/workflows/humble-coverage-build.yml
@@ -33,7 +33,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   coverage_humble:
diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
index c6204729cb..e52ffe6842 100644
--- a/.github/workflows/humble-debian-build.yml
+++ b/.github/workflows/humble-debian-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   humble_debian:
diff --git a/.github/workflows/humble-rhel-semi-binary-build.yml b/.github/workflows/humble-rhel-semi-binary-build.yml
index 3b2ba40179..6019d08e46 100644
--- a/.github/workflows/humble-rhel-semi-binary-build.yml
+++ b/.github/workflows/humble-rhel-semi-binary-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   humble_rhel_binary:
diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
index 8be0d8d145..2d0437782b 100644
--- a/.github/workflows/humble-semi-binary-build.yml
+++ b/.github/workflows/humble-semi-binary-build.yml
@@ -36,7 +36,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on humble branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'humble' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   semi_binary:
diff --git a/.github/workflows/jazzy-abi-compatibility.yml b/.github/workflows/jazzy-abi-compatibility.yml
index 00b2eef010..5da5fb9d00 100644
--- a/.github/workflows/jazzy-abi-compatibility.yml
+++ b/.github/workflows/jazzy-abi-compatibility.yml
@@ -17,7 +17,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   abi_check:
diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml
index 83799acc67..7dd294a55b 100644
--- a/.github/workflows/jazzy-binary-build.yml
+++ b/.github/workflows/jazzy-binary-build.yml
@@ -38,7 +38,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   binary:
diff --git a/.github/workflows/jazzy-coverage-build.yml b/.github/workflows/jazzy-coverage-build.yml
index 3cec3883b2..2f587c7003 100644
--- a/.github/workflows/jazzy-coverage-build.yml
+++ b/.github/workflows/jazzy-coverage-build.yml
@@ -36,7 +36,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   coverage_jazzy:
diff --git a/.github/workflows/jazzy-debian-build.yml b/.github/workflows/jazzy-debian-build.yml
index 620877c1ea..b1a60f1528 100644
--- a/.github/workflows/jazzy-debian-build.yml
+++ b/.github/workflows/jazzy-debian-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   jazzy_debian:
diff --git a/.github/workflows/jazzy-rhel-semi-binary-build.yml b/.github/workflows/jazzy-rhel-semi-binary-build.yml
index dba2955cb1..f39c9cc570 100644
--- a/.github/workflows/jazzy-rhel-semi-binary-build.yml
+++ b/.github/workflows/jazzy-rhel-semi-binary-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   jazzy_rhel:
diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml
index fcf1346f26..e38fd5b7ba 100644
--- a/.github/workflows/jazzy-semi-binary-build.yml
+++ b/.github/workflows/jazzy-semi-binary-build.yml
@@ -38,7 +38,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   semi_binary:
diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
index dc0717c832..1f0ec61d40 100644
--- a/.github/workflows/rolling-abi-compatibility.yml
+++ b/.github/workflows/rolling-abi-compatibility.yml
@@ -17,7 +17,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   abi_check:
diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml
index d806b91c4e..a3686144f3 100644
--- a/.github/workflows/rolling-binary-build.yml
+++ b/.github/workflows/rolling-binary-build.yml
@@ -39,7 +39,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   binary:
diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml
index 9b01c21f01..6370db30d1 100644
--- a/.github/workflows/rolling-compatibility-humble-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml
@@ -36,7 +36,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   build-on-humble:
diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
index de78374f0b..4da98f2d09 100644
--- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
+++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml
@@ -36,7 +36,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   build-on-jazzy:
diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml
index ff5c006d52..abea8a90db 100644
--- a/.github/workflows/rolling-coverage-build.yml
+++ b/.github/workflows/rolling-coverage-build.yml
@@ -33,7 +33,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   coverage_rolling:
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml
index e2ef234810..8f9394762b 100644
--- a/.github/workflows/rolling-debian-build.yml
+++ b/.github/workflows/rolling-debian-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   rolling_debian:
diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml
index d821b9323a..0f03ad02c2 100644
--- a/.github/workflows/rolling-rhel-semi-binary-build.yml
+++ b/.github/workflows/rolling-rhel-semi-binary-build.yml
@@ -21,7 +21,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   rolling_rhel:
diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml
index 7de1f42bb3..06f4c55612 100644
--- a/.github/workflows/rolling-semi-binary-build.yml
+++ b/.github/workflows/rolling-semi-binary-build.yml
@@ -38,7 +38,7 @@ on:
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on master branch
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'master' }}
+  cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
 
 jobs:
   semi_binary:

From cfc27b9ea0e24843aeceba2283c5c1ba1291903a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:03:41 +0100
Subject: [PATCH 13/15] Use master branch of control_toolbox

---
 ros2_controllers.jazzy.repos   | 2 +-
 ros2_controllers.rolling.repos | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ros2_controllers.jazzy.repos b/ros2_controllers.jazzy.repos
index 49b409b2c7..9428dbd2ce 100644
--- a/ros2_controllers.jazzy.repos
+++ b/ros2_controllers.jazzy.repos
@@ -14,7 +14,7 @@ repositories:
   control_toolbox:
     type: git
     url: https://github.com/ros-controls/control_toolbox.git
-    version: ci/clang
+    version: ros2-master
   kinematics_interface:
     type: git
     url: https://github.com/ros-controls/kinematics_interface.git
diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos
index 49b409b2c7..9428dbd2ce 100644
--- a/ros2_controllers.rolling.repos
+++ b/ros2_controllers.rolling.repos
@@ -14,7 +14,7 @@ repositories:
   control_toolbox:
     type: git
     url: https://github.com/ros-controls/control_toolbox.git
-    version: ci/clang
+    version: ros2-master
   kinematics_interface:
     type: git
     url: https://github.com/ros-controls/kinematics_interface.git

From 5e2213338b7abf2e63203399c95828a3c981d3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Sun, 8 Dec 2024 22:39:49 +0100
Subject: [PATCH 14/15] Use master branch

---
 ros2_controllers.jazzy.repos   | 2 +-
 ros2_controllers.rolling.repos | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ros2_controllers.jazzy.repos b/ros2_controllers.jazzy.repos
index 9428dbd2ce..8c20eccc96 100644
--- a/ros2_controllers.jazzy.repos
+++ b/ros2_controllers.jazzy.repos
@@ -2,7 +2,7 @@ repositories:
   ros2_control:
     type: git
     url: https://github.com/ros-controls/ros2_control.git
-    version: ci/clang
+    version: master
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git
diff --git a/ros2_controllers.rolling.repos b/ros2_controllers.rolling.repos
index 9428dbd2ce..8c20eccc96 100644
--- a/ros2_controllers.rolling.repos
+++ b/ros2_controllers.rolling.repos
@@ -2,7 +2,7 @@ repositories:
   ros2_control:
     type: git
     url: https://github.com/ros-controls/ros2_control.git
-    version: ci/clang
+    version: master
   realtime_tools:
     type: git
     url: https://github.com/ros-controls/realtime_tools.git

From 4016e26c0a5c70309d7ccbe3e3b27fba24c71854 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Mon, 9 Dec 2024 11:05:44 +0000
Subject: [PATCH 15/15] Use explicit iterator difference

---
 joint_trajectory_controller/src/trajectory.cpp                | 4 ++--
 .../test/test_trajectory_controller_utils.hpp                 | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/joint_trajectory_controller/src/trajectory.cpp b/joint_trajectory_controller/src/trajectory.cpp
index f91eb3e9d9..57366f88a8 100644
--- a/joint_trajectory_controller/src/trajectory.cpp
+++ b/joint_trajectory_controller/src/trajectory.cpp
@@ -175,8 +175,8 @@ bool Trajectory::sample(
 
         interpolate_between_points(t0, point, t1, next_point, sample_time, output_state);
       }
-      start_segment_itr = begin() + static_cast<std::ptrdiff_t>(i);
-      end_segment_itr = begin() + static_cast<std::ptrdiff_t>(i + 1);
+      start_segment_itr = begin() + static_cast<TrajectoryPointConstIter::difference_type>(i);
+      end_segment_itr = begin() + static_cast<TrajectoryPointConstIter::difference_type>(i + 1);
       if (search_monotonically_increasing)
       {
         last_sample_idx_ = i;
diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
index 656bed11d5..b0e66394d1 100644
--- a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
+++ b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@@ -468,7 +468,8 @@ class TrajectoryControllerTest : public ::testing::Test
     {
       traj_msg.joint_names = {
         joint_names_.begin(),
-        joint_names_.begin() + static_cast<std::ptrdiff_t>(points_positions[0].size())};
+        joint_names_.begin() +
+          static_cast<std::vector<std::string>::difference_type>(points_positions[0].size())};
     }
     else
     {