Update industrialci.yml

This commit is contained in:
Zachary 2021-07-12 18:14:13 +08:00
parent 223c8077ac
commit 3726d165de
2 changed files with 17 additions and 18 deletions

View file

@ -24,7 +24,10 @@ jobs:
env: env:
- { ROS_DISTRO: melodic, ROS_REPO: main } - { ROS_DISTRO: melodic, ROS_REPO: main }
# - { ROS_DISTRO: noetic, ROS_REPO: main } # - { ROS_DISTRO: noetic, ROS_REPO: main }
env:
CCACHE_DIR: /github/home/.ccache
ISOLATION: shell
steps: steps:
- name: Setup directories - name: Setup directories
run: mkdir -p ros_ws/src run: mkdir -p ros_ws/src
@ -32,8 +35,9 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
path: ros_ws/src path: ros_ws/src
- name: Setup ROS environment - uses: actions/cache@v2
uses: ros-tooling/setup-ros@0.2.1 with:
env: ${{ matrix.env }} path: ${{ env.CCACHE_DIR }}
key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
- uses: "ros-industrial/industrial_ci@master" - uses: "ros-industrial/industrial_ci@master"
env: ${{ matrix.env }} env: ${{ matrix.env }}

View file

@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(mycobot_280) project(mycobot_280)
add_compile_options(-std=c++11) add_compile_options(-std=c++11)
## Find catkin and any catkin packages ## Find catkin and any catkin packages
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
roscpp roscpp
rospy rospy
std_msgs std_msgs
actionlib actionlib
image_transport image_transport
cv_bridge cv_bridge
@ -18,11 +18,11 @@ catkin_package(
) )
## Build talker and listener ## 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 catkin_install_python(PROGRAMS
scripts/follow_display.py scripts/follow_display.py
scripts/slider_control.py scripts/slider_control.py
scripts/teleop_keyboard.py scripts/teleop_keyboard.py
scripts/listen_real.py scripts/listen_real.py
scripts/listen_real_of_topic.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}) target_link_libraries(opencv_camera ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
add_executable(camera_display src/camera_display) add_executable(camera_display src/camera_display)
target_link_libraries(camera_display ${catkin_LIBRARIES} ${OpenCV_LIBRARIES}) target_link_libraries(camera_display ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
if (CATKIN_ENABLE_TESTING)
find_package(roslaunch REQUIRED)
roslaunch_add_file_check(launch)
endif()