From e057007d79b8770fa3d27e69a7eda61c00ace74b Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sat, 22 May 2021 19:29:45 +0900
Subject: [PATCH 1/6] Add Industrial CI

---
 .github/workflows/industrialci.yml | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/industrialci.yml

diff --git a/.github/workflows/industrialci.yml b/.github/workflows/industrialci.yml
new file mode 100644
index 0000000..46bab4c
--- /dev/null
+++ b/.github/workflows/industrialci.yml
@@ -0,0 +1,31 @@
+name: industrial_ci
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.jpg'
+      - '**.pdf'
+      - '**.png'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.jpg'
+      - '**.pdf'
+      - '**.png'
+  schedule:
+    - cron: "0 1 * * 2" # Weekly on Tuesdays at 01:00(GMT)
+
+jobs:
+  industrial_ci:
+    continue-on-error: true
+    strategy:
+      matrix:
+        env:
+          - { ROS_DISTRO: melodic, ROS_REPO: main }
+          # - { ROS_DISTRO: noetic, ROS_REPO: main }
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: "ros-industrial/industrial_ci@master"
+        env: ${{ matrix.env }}

From b269d0b48d2c266bbb35e44e89aba1edeb9c1d12 Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sat, 22 May 2021 19:35:09 +0900
Subject: [PATCH 2/6] Add launch test

---
 .github/workflows/industrialci.yml | 1 -
 CMakeLists.txt                     | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/industrialci.yml b/.github/workflows/industrialci.yml
index 46bab4c..2196f9b 100644
--- a/.github/workflows/industrialci.yml
+++ b/.github/workflows/industrialci.yml
@@ -18,7 +18,6 @@ on:
 
 jobs:
   industrial_ci:
-    continue-on-error: true
     strategy:
       matrix:
         env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b86e0e8..98ed77b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,4 +63,7 @@ target_link_libraries(opencv_camera ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
 add_executable(camera_display src/camera_display)
 target_link_libraries(camera_display ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
 
-
+if (CATKIN_ENABLE_TESTING)
+  find_package(roslaunch REQUIRED)
+  roslaunch_add_file_check(launch)
+endif()

From f65043a27aba00a39730d097aaaa773bc83efe72 Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sat, 22 May 2021 20:41:57 +0900
Subject: [PATCH 3/6] Fix launch file error

---
 launch/run_benchmark_ompl.launch | 2 +-
 launch/warehouse.launch          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/launch/run_benchmark_ompl.launch b/launch/run_benchmark_ompl.launch
index 066ed63..18d2446 100644
--- a/launch/run_benchmark_ompl.launch
+++ b/launch/run_benchmark_ompl.launch
@@ -1,7 +1,7 @@
 <launch>
 
   <!-- This argument must specify the list of .cfg files to process for benchmarking -->
-  <arg name="cfg" />
+  <arg name="cfg" default="" />
 
   <!-- Load URDF -->
   <include file="$(find mycobot_ros)/launch/planning_context.launch">
diff --git a/launch/warehouse.launch b/launch/warehouse.launch
index fbae8fb..aff99ab 100644
--- a/launch/warehouse.launch
+++ b/launch/warehouse.launch
@@ -1,7 +1,7 @@
 <launch>
 
   <!-- The path to the database must be specified -->
-  <arg name="moveit_warehouse_database_path" />
+  <arg name="moveit_warehouse_database_path" default="" />
 
   <!-- Load warehouse parameters -->
   <include file="$(find mycobot_ros)/launch/warehouse_settings.launch.xml" />

From a60048bf05684781902328ae1f6b66319cac3dd2 Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sat, 22 May 2021 19:52:40 +0900
Subject: [PATCH 4/6] Add missing package

---
 package.xml | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/package.xml b/package.xml
index ac79a27..673489e 100644
--- a/package.xml
+++ b/package.xml
@@ -13,31 +13,35 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <exec_depend>moveit_ros_move_group</exec_depend>
-  <exec_depend>moveit_fake_controller_manager</exec_depend>
-  <exec_depend>moveit_kinematics</exec_depend>
-  <exec_depend>moveit_planners_ompl</exec_depend>
-  <exec_depend>moveit_ros_visualization</exec_depend>
-  <exec_depend>moveit_setup_assistant</exec_depend>
-  <exec_depend>joint_state_publisher</exec_depend>
-  <exec_depend>robot_state_publisher</exec_depend>
-  <exec_depend>xacro</exec_depend>
-
   <build_depend>roscpp</build_depend>
   <build_depend>rospy</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>message_generation</build_depend>
+  <build_depend>actionlib</build_depend>
+  <build_depend>moveit_msgs</build_depend>
 
   <exec_depend>roscpp</exec_depend>
   <exec_depend>rospy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
   <exec_depend>message_runtime</exec_depend>
-
-  <build_depend>actionlib</build_depend>
-  <build_depend>moveit_msgs</build_depend>
-
   <exec_depend>actionlib</exec_depend>
   <exec_depend>moveit_msgs</exec_depend>
+  <exec_depend>moveit_fake_controller_manager</exec_depend>
+  <exec_depend>moveit_kinematics</exec_depend>
+  <exec_depend>moveit_planners_ompl</exec_depend>
+  <exec_depend>moveit_ros_benchmarks</exec_depend>
+  <exec_depend>moveit_ros_visualization</exec_depend>
+  <exec_depend>moveit_ros_move_group</exec_depend>
+  <exec_depend>moveit_ros_warehouse</exec_depend>
+  <exec_depend>moveit_setup_assistant</exec_depend>
+  <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>xacro</exec_depend>
+  <exec_depend>joy</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>warehouse_ros_mongo</exec_depend>
+  <exec_depend>gazebo_ros</exec_depend>
+  <exec_depend>controller_manager</exec_depend>
 
 
   <!-- The export tag contains other, unspecified, tags -->

From 7dd845ecf3478c4fb640c9d128e8a2ac1b814d29 Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sun, 23 May 2021 20:41:48 +0900
Subject: [PATCH 5/6] Fix launch error on Melodic

[ERROR] [1621765082.130143]: Could not find the GUI, install the 'joint_state_publisher_gui' package
---
 package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.xml b/package.xml
index 673489e..695304e 100644
--- a/package.xml
+++ b/package.xml
@@ -35,6 +35,7 @@
   <exec_depend>moveit_ros_warehouse</exec_depend>
   <exec_depend>moveit_setup_assistant</exec_depend>
   <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>joint_state_publisher_gui</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
   <exec_depend>xacro</exec_depend>
   <exec_depend>joy</exec_depend>

From dcf3da3cf4037abb035316be19b340e0bae65bea Mon Sep 17 00:00:00 2001
From: Daisuke Sato <tiryoh@gmail.com>
Date: Sun, 23 May 2021 20:42:03 +0900
Subject: [PATCH 6/6] Add missing package for simple_gui

related: https://github.com/elephantrobotics/mycobot_ros/commit/c2d87585c5f32cefff1439c7b363acda33947bd3
---
 package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.xml b/package.xml
index 695304e..200781a 100644
--- a/package.xml
+++ b/package.xml
@@ -43,6 +43,7 @@
   <exec_depend>warehouse_ros_mongo</exec_depend>
   <exec_depend>gazebo_ros</exec_depend>
   <exec_depend>controller_manager</exec_depend>
+  <exec_depend>python-tk</exec_depend>
 
 
   <!-- The export tag contains other, unspecified, tags -->