Skip to content

Commit 92688c3

Browse files
committed
MTC Tutorial: Fix Workflow Issues
- Add moveit_task_constructor package as upstream workspace package to CI. - Add build and run dependency entries for moveit_task_constructor_core package. - Fix EOF's.
1 parent 4a6f2cf commit 92688c3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
CCACHE_DIR: ${{ github.workspace }}/.ccache
2323
BASEDIR: ${{ github.workspace }}/.work
2424
CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }}
25+
UPSTREAM_WORKSPACE: github:ros-planning/moveit_task_constructor#master
2526

2627
name: ${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}
2728
runs-on: ubuntu-latest

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ find_package(catkin REQUIRED
1111
moveit_ros_planning
1212
moveit_ros_planning_interface
1313
moveit_ros_perception
14+
moveit_task_constructor_core
1415
rviz_visual_tools
1516
moveit_visual_tools
1617
pluginlib
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_package(catkin REQUIRED COMPONENTS
2-
moveit_task_constructor_core
3-
)
4-
51
add_executable(extension src/extension_tutorial.cpp)
62
target_link_libraries(extension
73
${catkin_LIBRARIES}
@@ -13,4 +9,4 @@ install(
139
extension
1410
RUNTIME DESTINATION
1511
${CATKIN_PACKAGE_BIN_DESTINATION}
16-
)
12+
)

doc/moveit_task_constructor/src/extension_tutorial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,4 +287,4 @@ int main(int argc, char** argv)
287287
ros::waitForShutdown();
288288

289289
return 0;
290-
}
290+
}

package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<build_depend>moveit_ros_planning</build_depend>
2525
<build_depend>moveit_ros_planning_interface</build_depend>
2626
<build_depend>moveit_ros_perception</build_depend>
27+
<build_depend>moveit_task_constructor_core</build_depend>
2728
<build_depend>interactive_markers</build_depend>
2829
<build_depend>geometric_shapes</build_depend>
2930
<build_depend>moveit_visual_tools</build_depend>
@@ -43,6 +44,7 @@
4344
<run_depend>moveit_fake_controller_manager</run_depend>
4445
<run_depend>moveit_ros_planning_interface</run_depend>
4546
<run_depend>moveit_ros_perception</run_depend>
47+
<run_depend>moveit_task_constructor_core</run_depend>
4648
<run_depend>interactive_markers</run_depend>
4749
<run_depend>moveit_visual_tools</run_depend>
4850
<run_depend>rviz_visual_tools</run_depend>

0 commit comments

Comments
 (0)