updated cmakelists for ros build, added ci config to test both catkin_make and catkin_make_isolated

This commit is contained in:
Ruixiang Du
2020-09-07 14:14:58 +08:00
parent 5ec8b633c1
commit 37d1f2c963
2 changed files with 16 additions and 3 deletions

View File

@@ -30,7 +30,7 @@ cpp-test:
# - cpp-build
## Build and test as catkin package
catkin-build:
melodic-catkin-build:
stage: build
image: rduweston/ubuntu-ci:melodic-bionic
before_script:
@@ -38,4 +38,15 @@ catkin-build:
script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
- cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
- cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
## Build and test as catkin package
melodic-catkin-isolated-build:
stage: build
image: rduweston/ubuntu-ci:melodic-bionic
before_script:
- apt update && apt -y install libasio-dev
script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
- cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install"