From 3726d165de982a21c75a597731f32c4330282ffa Mon Sep 17 00:00:00 2001
From: Zachary <zlj19971222@outlook.com>
Date: Mon, 12 Jul 2021 18:14:13 +0800
Subject: [PATCH] Update industrialci.yml

---
 .github/workflows/industrialci.yml | 12 ++++++++----
 mycobot_280/CMakeLists.txt         | 23 +++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/industrialci.yml b/.github/workflows/industrialci.yml
index 14d8ed6..a506698 100644
--- a/.github/workflows/industrialci.yml
+++ b/.github/workflows/industrialci.yml
@@ -24,7 +24,10 @@ jobs:
         env:
           - { ROS_DISTRO: melodic, ROS_REPO: main }
           # - { ROS_DISTRO: noetic, ROS_REPO: main }
-
+    env:
+      CCACHE_DIR: /github/home/.ccache
+      ISOLATION: shell
+      
     steps:
       - name: Setup directories
         run: mkdir -p ros_ws/src
@@ -32,8 +35,9 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: ros_ws/src
-      - name: Setup ROS environment
-        uses: ros-tooling/setup-ros@0.2.1
-        env: ${{ matrix.env }}
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
       - uses: "ros-industrial/industrial_ci@master"
         env: ${{ matrix.env }}
diff --git a/mycobot_280/CMakeLists.txt b/mycobot_280/CMakeLists.txt
index 39668c7..ddfbb94 100755
--- a/mycobot_280/CMakeLists.txt
+++ b/mycobot_280/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(mycobot_280) 
+project(mycobot_280)
 add_compile_options(-std=c++11)
 
 ## Find catkin and any catkin packages
-find_package(catkin REQUIRED COMPONENTS 
-  roscpp 
-  rospy 
-  std_msgs 
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  rospy
+  std_msgs
   actionlib
   image_transport
   cv_bridge
@@ -18,11 +18,11 @@ catkin_package(
 )
 
 ## Build talker and listener
-include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}) 
+include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
 
-catkin_install_python(PROGRAMS 
-  scripts/follow_display.py 
-  scripts/slider_control.py 
+catkin_install_python(PROGRAMS
+  scripts/follow_display.py
+  scripts/slider_control.py
   scripts/teleop_keyboard.py
   scripts/listen_real.py
   scripts/listen_real_of_topic.py
@@ -42,8 +42,3 @@ add_executable(opencv_camera src/opencv_camera)
 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()