Skip to content

Commit 28b4e25

Browse files
authored
Merge branch 'ros2-master' into ros2-master
2 parents e15f1a2 + bedbfcc commit 28b4e25

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@ on:
77
pull_request:
88
branches:
99
- ros2-master
10-
# types:
11-
# - labeled
1210
push:
1311
branches:
1412
- ros2-master
15-
# issue_comment:
16-
# types:
17-
# - created
1813

1914
concurrency:
2015
# cancel previous runs of the same workflow, except for pushes on given branches branch
@@ -23,14 +18,11 @@ concurrency:
2318

2419
jobs:
2520
binary-windows:
26-
# if: |
27-
# (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) ||
28-
# (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) ||
29-
# (github.event_name == 'workflow_dispatch')
3021
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
3122
with:
3223
ros_distro: rolling
3324
ref_for_scheduled_build: master
3425
pixi_dependencies: typeguard jinja2 boost compilers
3526
windows_dependencies: control_toolbox.windows.rolling.repos
3627
ninja_packages: rsl
28+
skip_packages: generate_parameter_library_example_external generate_parameter_library_example

control_toolbox/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
2525
realtime_tools
2626
)
2727

28+
find_package(backward_ros REQUIRED)
2829
find_package(ament_cmake REQUIRED)
2930
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
3031
find_package(${Dependency} REQUIRED)

control_toolbox/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<build_depend>ros2_control_cmake</build_depend>
2525
<build_depend>fmt</build_depend>
2626

27+
<depend>backward_ros</depend>
2728
<depend>control_msgs</depend>
2829
<depend>eigen</depend>
2930
<depend>filters</depend>

0 commit comments

Comments
 (0)