Skip to content

Commit 924f450

Browse files
authored
Merge branch 'master' into add/overrun/parameters
2 parents b52d21a + 498a052 commit 924f450

14 files changed

+51
-67
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
- '**/package.xml'
1414
- '**/CMakeLists.txt'
1515
- 'ros2_control.humble.repos'
16+
pull_request:
17+
branches:
18+
- humble
19+
paths:
20+
- .github/workflows/humble-source-build.yml
1621
schedule:
1722
# Run every day to detect flakiness and broken dependencies
1823
- cron: '03 3 * * MON-FRI'
@@ -23,4 +28,4 @@ jobs:
2328
with:
2429
ros_distro: humble
2530
ref: humble
26-
os_name: ubuntu-22.04
31+
container: ubuntu:22.04

.github/workflows/jazzy-source-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
- '**/package.xml'
1414
- '**/CMakeLists.txt'
1515
- 'ros2_control.jazzy.repos'
16+
pull_request:
17+
branches:
18+
- jazzy
19+
paths:
20+
- .github/workflows/jazzy-source-build.yml
1621
schedule:
1722
# Run every day to detect flakiness and broken dependencies
1823
- cron: '03 3 * * MON-FRI'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,5 @@ jobs:
4242
with:
4343
ros_distro: rolling
4444
pixi_dependencies: typeguard jinja2 boost compilers
45-
windows_dependencies: ros2_control.windows.rolling.repos
4645
ninja_packages: rsl
47-
skip_packages: diagnostic_remote_logging generate_parameter_library_example_external generate_parameter_library_example
4846
target_cmake_args: -DBUILD_TESTING=OFF

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ on:
1414
- '**/CMakeLists.txt'
1515
- 'ros2_control.rolling.repos'
1616
- 'ros2_control.kilted.repos'
17+
pull_request:
18+
branches:
19+
- master
20+
paths:
21+
- .github/workflows/rolling-source-build.yml
1722
schedule:
1823
# Run every day to detect flakiness and broken dependencies
1924
- cron: '03 3 * * MON-FRI'

hardware_interface/include/hardware_interface/types/statistics_types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class MovingAverageStatistics
169169
*
170170
* @param item The item that was observed
171171
*/
172-
virtual void add_measurement(const double item)
172+
void add_measurement(const double item)
173173
{
174174
std::lock_guard<DEFAULT_MUTEX> guard{mutex_};
175175

ros2_control.humble.repos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
repositories:
2-
ros-controls/realtime_tools:
2+
realtime_tools:
33
type: git
44
url: https://github.com/ros-controls/realtime_tools.git
55
version: humble
6-
ros-controls/control_msgs:
6+
control_msgs:
77
type: git
88
url: https://github.com/ros-controls/control_msgs.git
99
version: humble

ros2_control.jazzy.repos

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repositories:
2-
ros-controls/realtime_tools:
2+
realtime_tools:
33
type: git
44
url: https://github.com/ros-controls/realtime_tools.git
55
version: jazzy
6-
ros-controls/control_msgs:
6+
control_msgs:
77
type: git
88
url: https://github.com/ros-controls/control_msgs.git
99
version: jazzy
10-
ros-controls/ros2_control_cmake:
10+
ros2_control_cmake:
1111
type: git
1212
url: https://github.com/ros-controls/ros2_control_cmake.git
1313
version: master

ros2_control.kilted.repos

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repositories:
2-
ros-controls/realtime_tools:
2+
realtime_tools:
33
type: git
44
url: https://github.com/ros-controls/realtime_tools.git
55
version: master
6-
ros-controls/control_msgs:
6+
control_msgs:
77
type: git
88
url: https://github.com/ros-controls/control_msgs.git
99
version: master
10-
ros-controls/ros2_control_cmake:
10+
ros2_control_cmake:
1111
type: git
1212
url: https://github.com/ros-controls/ros2_control_cmake.git
1313
version: master

ros2_control.rolling.repos

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repositories:
2-
ros-controls/realtime_tools:
2+
realtime_tools:
33
type: git
44
url: https://github.com/ros-controls/realtime_tools.git
55
version: master
6-
ros-controls/control_msgs:
6+
control_msgs:
77
type: git
88
url: https://github.com/ros-controls/control_msgs.git
99
version: master
10-
ros-controls/ros2_control_cmake:
10+
ros2_control_cmake:
1111
type: git
1212
url: https://github.com/ros-controls/ros2_control_cmake.git
1313
version: master

ros2_control.windows.rolling.repos

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)