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.
moveit · Aug 30, 2021 · aff144e · aff144e
1 parent 89d0eba
commit aff144e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,6 +22,7 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       BASEDIR: ${{ github.workspace }}/.work
       CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }}
+      UPSTREAM_WORKSPACE: github:ros-planning/moveit_task_constructor#master
 
     name: ${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}
     runs-on: ubuntu-latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,7 @@ find_package(catkin REQUIRED
     moveit_ros_planning
     moveit_ros_planning_interface
     moveit_ros_perception
+    moveit_task_constructor_core
     rviz_visual_tools
     moveit_visual_tools
     pluginlib

diff --git a/doc/moveit_task_constructor/CMakeLists.txt b/doc/moveit_task_constructor/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(catkin REQUIRED COMPONENTS
-	moveit_task_constructor_core
-)
-
 add_executable(extension  src/extension_tutorial.cpp)
 target_link_libraries(extension
   ${catkin_LIBRARIES}
@@ -13,4 +9,4 @@ install(
     extension
   RUNTIME DESTINATION
     ${CATKIN_PACKAGE_BIN_DESTINATION}
-)
+)
diff --git a/doc/moveit_task_constructor/src/extension_tutorial.cpp b/doc/moveit_task_constructor/src/extension_tutorial.cpp
@@ -287,4 +287,4 @@ int main(int argc, char** argv)
   ros::waitForShutdown();
 
   return 0;
-}
+}
diff --git a/package.xml b/package.xml
@@ -24,6 +24,7 @@
   <build_depend>moveit_ros_planning</build_depend>
   <build_depend>moveit_ros_planning_interface</build_depend>
   <build_depend>moveit_ros_perception</build_depend>
+  <build_depend>moveit_task_constructor_core</build_depend>
   <build_depend>interactive_markers</build_depend>
   <build_depend>geometric_shapes</build_depend>
   <build_depend>moveit_visual_tools</build_depend>
@@ -43,6 +44,7 @@
   <run_depend>moveit_fake_controller_manager</run_depend>
   <run_depend>moveit_ros_planning_interface</run_depend>
   <run_depend>moveit_ros_perception</run_depend>
+  <run_depend>moveit_task_constructor_core</run_depend>
   <run_depend>interactive_markers</run_depend>
   <run_depend>moveit_visual_tools</run_depend>
   <run_depend>rviz_visual_tools</run_depend>
-Original file line number
+Diff line change
@@ Expand Up / @@ -287,4 +287,4 @@ int main(int argc, char** argv) @@
       ros::waitForShutdown();
       return 0;
-    }
+    }