diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 122e4d29eb5341c8b77e6d52582ae75e74e262fe..64ee4a176073d869a6950b5fe45354f735618508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,13 @@ +workflow: + rules: + - if: '$CI_PIPELINE_SOURCE == "web"' + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" + when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' + when: never + - if: '$CI_COMMIT_BRANCH' + stages: - license - build_and_test @@ -10,7 +20,6 @@ stages: - echo $WOLF_IMU_BRANCH - echo $WOLF_ROS_NODE_BRANCH - echo $CI_COMMIT_BRANCH - - echo $WOLF_ROS_IMU_BRANCH .preliminaries_template: &preliminaries_definition ## Install ssh-agent if not already installed, it is required by Docker. @@ -79,8 +88,7 @@ stages: - if [ -d wolf ]; then - echo "directory wolf exists" - cd wolf - - git checkout devel - - git pull + - git fetch --all - git checkout $WOLF_CORE_BRANCH - git pull - else @@ -98,8 +106,7 @@ stages: - if [ -d imu ]; then - echo "directory imu exists" - cd imu - - git checkout devel - - git pull + - git fetch --all - git checkout $WOLF_IMU_BRANCH - git pull - else diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a00252da414ee2532b732a49621f5be595cadfd..2c71f48daa65a0b282415a63e95fb5ea53f7e18e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(wolf_ros_imu) ## Compile as C++14 add_compile_options(-std=c++14) # -fPIC and -rdynamic ensure unique singleton instance across shared libraries (for factories) see: https://stackoverflow.com/a/8626922 -SET(CMAKE_CXX_FLAGS "-fPIC -rdynamic") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -rdynamic") ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) @@ -52,11 +52,13 @@ add_library(publisher_${PROJECT_NAME} target_link_libraries(subscriber_${PROJECT_NAME} wolfcore wolfimu + ${catkin_LIBRARIES} ${sensor_msgs_LIBRARIES} ) target_link_libraries(publisher_${PROJECT_NAME} wolfcore wolfimu + ${catkin_LIBRARIES} ${sensor_msgs_LIBRARIES} ) \ No newline at end of file diff --git a/package.xml b/package.xml index 46b8317560560ee2d5e9d7ce51792eef2964adea..63ce6895e448cda178325f9fe5187b95b0afbb70 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ <package format="2"> <name>wolf_ros_imu</name> <version>0.0.0</version> - <description>The wolf_ros package of GAUSS project</description> + <description>The wolf_ros package of WOLF project</description> <!-- One maintainer tag required, multiple allowed, one person per tag --> <!-- Example: -->