Merge pull request #1370 from k-okada/fix_ga

k-okada · web-flow · commit d39f3ac0785f · 2022-10-23T18:19:55.000+09:00
specify full version of actions/Checkout for github
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -37,7 +37,7 @@ jobs:
             BEFORE_SCRIPT: "TEST_ROBOT=fetch ./jsk_demos/.travis.before_script.sh"
           - ROS_DISTRO: noetic
             CONTAINER: jskrobotics/ros-ubuntu:20.04-pcl
-            continue-on-error: true
+            EXTRA_DEB : "python3-rospkg python3-rospkg-modules"  #  drc_task_common need rospkg, but not installed
 
     container: ${{ matrix.CONTAINER }}
     steps:
@@ -66,10 +66,11 @@ jobs:
           # ls -al /home/runner/work/_temp/_github_workflow/
 
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: Start X server
         run: |
+          if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then exit 0; fi
           echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
           sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
           export DISPLAY=:0
@@ -78,6 +79,7 @@ jobs:
           sleep 3 # wait x server up
           export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
           xhost +local:root
+        shell: bash
 
       - name: Run jsk_travis
         uses: jsk-ros-pkg/jsk_travis@master
diff --git a/interactive_behavior_201409/CMakeLists.txt b/interactive_behavior_201409/CMakeLists.txt
@@ -7,7 +7,6 @@ project(interactive_behavior_201409)
 find_package(catkin REQUIRED COMPONENTS
   face_detector
   people_msgs
-  pr2eus
   roseus
 )
 
diff --git a/interactive_behavior_201409/package.xml b/interactive_behavior_201409/package.xml
@@ -9,7 +9,6 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>face_detector</build_depend>
   <build_depend>people_msgs</build_depend>
-  <build_depend>pr2eus</build_depend>
   <build_depend>roseus</build_depend>
   <build_depend>face_recognition</build_depend>
   <run_depend>face_detector</run_depend>
diff --git a/jsk_2013_04_pr2_610/CMakeLists.txt b/jsk_2013_04_pr2_610/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(catkin REQUIRED COMPONENTS
   message_generation
   jsk_demo_common
   jsk_perception
-  pddl_planner
   roseus_smach
   roseus)
 
@@ -22,7 +21,7 @@ generate_messages(
 )
 
 catkin_package(
-CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception pddl_planner pr2eus roseus_smach
+CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception roseus_smach
 )
 
 ###########
diff --git a/jsk_2013_04_pr2_610/package.xml b/jsk_2013_04_pr2_610/package.xml
@@ -26,8 +26,6 @@
   <build_depend>jsk_demo_common</build_depend>
   <build_depend>jsk_perception</build_depend>
   <build_depend>task_compiler</build_depend>
-  <build_depend>pddl_planner</build_depend>
-  <build_depend>pddl_planner_viewer</build_depend>
   <build_depend>laser_filters_jsk_patch</build_depend>
   <build_depend>imagesift</build_depend>
 
diff --git a/jsk_2015_06_hrp_drc/drc_task_common/CMakeLists.txt b/jsk_2015_06_hrp_drc/drc_task_common/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(drc_task_common)
 
-find_package(catkin REQUIRED COMPONENTS cmake_modules message_generation std_msgs std_srvs geometry_msgs roscpp rospy sensor_msgs visualization_msgs message_filters message_generation jsk_pcl_ros interactive_markers pcl_conversions jsk_topic_tools rviz eigen_conversions dynamic_tf_publisher jsk_interactive_marker jsk_recognition_msgs move_base_msgs rosgraph_msgs topic_tools jsk_topic_tools jsk_ik_server pcl_msgs jsk_footstep_msgs drc_com_common jsk_perception jsk_calibration resized_image_transport smach_msgs pcl_ros nav_msgs tf dynamic_reconfigure roseus)
+find_package(catkin REQUIRED COMPONENTS cmake_modules message_generation std_msgs std_srvs geometry_msgs roscpp rospy sensor_msgs visualization_msgs message_filters message_generation jsk_pcl_ros interactive_markers pcl_conversions jsk_topic_tools rviz eigen_conversions dynamic_tf_publisher jsk_interactive_marker jsk_recognition_msgs move_base_msgs rosgraph_msgs topic_tools jsk_topic_tools pcl_msgs jsk_footstep_msgs drc_com_common jsk_perception resized_image_transport smach_msgs pcl_ros nav_msgs tf dynamic_reconfigure roseus)
 
 catkin_python_setup()
 
@@ -15,9 +15,9 @@ add_service_files(DIRECTORY srv FILES RvizMenuCall.srv RvizMenuSelect.srv EusCom
 
 # Generate msg file from DRCParametersConfig file
 set(tmp_pythonpath $ENV{PYTHONPATH})
-set(ENV{PYTHONPATH} ${CATKIN_DEVEL_PREFIX}/${PYTHON_INSTALL_DIR}:$ENV{PYTHONPATH})
+set(ENV{PYTHONPATH} ${CATKIN_DEVEL_PREFIX}/${PYTHON_INSTALL_DIR}:$ENV{PYTHONPATH}:/usr/lib/python$ENV{ROS_PYTHON_VERSION}/dist-packages)
 execute_process(
-  COMMAND ${PROJECT_SOURCE_DIR}/scripts/gen_reconfigure_msg.py ${PROJECT_SOURCE_DIR}/msg/DRCParametersMessage.msg
+  COMMAND python$ENV{ROS_PYTHON_VERSION} ${PROJECT_SOURCE_DIR}/scripts/gen_reconfigure_msg.py ${PROJECT_SOURCE_DIR}/msg/DRCParametersMessage.msg
   OUTPUT_VARIABLE output_variable
   RESULT_VARIABLE result_variable
   ERROR_VARIABLE error_variable
diff --git a/jsk_2015_06_hrp_drc/drc_task_common/package.xml b/jsk_2015_06_hrp_drc/drc_task_common/package.xml
@@ -7,6 +7,7 @@
   <author email="murooka@jsk.t.u-tokyo.ac.jp">Masaki Murooka</author>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>rospkg</build_depend>
   <build_depend>move_base_msgs</build_depend>
   <build_depend>rosgraph_msgs</build_depend>
   <build_depend>roseus</build_depend>
@@ -36,15 +37,13 @@
   <build_depend>dynamic_reconfigure</build_depend>
   <build_depend>jsk_teleop_joy</build_depend>
   <build_depend>jsk_recognition_msgs</build_depend>
-  <build_depend>jsk_ik_server</build_depend>
   <build_depend>pr2eus</build_depend>
   <build_depend>pcl_msgs</build_depend>
   <build_depend>jsk_footstep_msgs</build_depend>
   <build_depend>jsk_footstep_planner</build_depend>
   <build_depend>jsk_footstep_controller</build_depend>
   <build_depend>drc_com_common</build_depend>
   <build_depend>jsk_perception</build_depend>
-  <build_depend>jsk_calibration</build_depend>
   <build_depend>resized_image_transport</build_depend>
   <build_depend>jsk_rqt_plugins</build_depend>
   <build_depend>jsk_rviz_plugins</build_depend>
@@ -84,7 +83,6 @@
   <run_depend>jsk_footstep_controller</run_depend>
   <run_depend>drc_com_common</run_depend>
   <run_depend>jsk_perception</run_depend>
-  <run_depend>jsk_calibration</run_depend>
   <run_depend>resized_image_transport</run_depend>
   <run_depend>python-fysom</run_depend>
   <run_depend>jsk_rqt_plugins</run_depend>
diff --git a/jsk_demo_common/CMakeLists.txt b/jsk_demo_common/CMakeLists.txt
@@ -9,8 +9,6 @@ find_package(catkin REQUIRED COMPONENTS
   jsk_hark_msgs
   jsk_maps
   jsk_perception
-  pddl_planner
-  pr2eus
   pr2_gripper_sensor_msgs
   roseus
   roseus_smach
@@ -39,7 +37,7 @@ generate_messages(
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES jsk_demo_common
-  CATKIN_DEPENDS control_msgs jsk_hark_msgs jsk_maps jsk_perception pddl_planner pr2eus roseus roseus_smach message_runtime
+  CATKIN_DEPENDS control_msgs jsk_hark_msgs jsk_maps jsk_perception roseus roseus_smach message_runtime
 #  DEPENDS system_lib
 )
 
diff --git a/jsk_demo_common/package.xml b/jsk_demo_common/package.xml
@@ -17,8 +17,6 @@
   <build_depend>jsk_hark_msgs</build_depend>
   <build_depend>jsk_maps</build_depend>
   <build_depend>jsk_perception</build_depend>
-  <build_depend>pddl_planner</build_depend>
-  <build_depend>pr2eus</build_depend>
   <build_depend>roseus</build_depend>
   <build_depend>roseus_smach</build_depend>
   <build_depend>message_generation</build_depend>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ project(interactive_behavior_201409)`
`7`	`7`	`find_package(catkin REQUIRED COMPONENTS`
`8`	`8`	`face_detector`
`9`	`9`	`people_msgs`
`10`		`- pr2eus`
`11`	`10`	`roseus`
`12`	`11`	`)`
`13`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ find_package(catkin REQUIRED COMPONENTS`
`6`	`6`	`message_generation`
`7`	`7`	`jsk_demo_common`
`8`	`8`	`jsk_perception`
`9`		`- pddl_planner`
`10`	`9`	`roseus_smach`
`11`	`10`	`roseus)`
`12`	`11`
`@@ -22,7 +21,7 @@ generate_messages(`
`22`	`21`	`)`
`23`	`22`
`24`	`23`	`catkin_package(`
`25`		`-CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception pddl_planner pr2eus roseus_smach`
	`24`	`+CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception roseus_smach`
`26`	`25`	`)`
`27`	`26`
`28`	`27`	`###########`