Skip to content

Commit 625f07f

Browse files
authored
Merge branch 'main' into fix/skip-non-auto-added-callback-groups
2 parents 27fedcc + b645bbc commit 625f07f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/build-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
if: steps.check_diff_cpp.outputs.cpp_changed == 'true'
5858
run: |
5959
source /opt/ros/humble/setup.bash
60-
colcon build --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=1
60+
colcon build --parallel-workers 1 --merge-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=1
6161
6262
# TODO: run tests

cie_thread_configurator/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<test_depend>ament_lint_common</test_depend>
2121

2222
<depend>rclcpp</depend>
23+
<depend>yaml-cpp</depend>
2324

2425
<depend>cie_config_msgs</depend>
2526

0 commit comments

Comments
 (0)