diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ceb7d6a8be2172d0fac5336d78c6b63caa7d69c1..58d8fe69ba8ecdf6c9b4599df3876765b6861278 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,13 +27,10 @@ stages: # create ci_deps folder (if not exists) - mkdir -pv ci_deps - - - cd - - ls - - pwd - - cat .bashrc - - source .bashrc - - roscd + + # manually source ros setup.bash + - source /root/catkin_ws/devel/setup.bash + - roscd # check that it works .license_header_template: &license_header_definition - cd $CI_PROJECT_DIR @@ -74,6 +71,7 @@ stages: - if [ -d wolf ]; then - echo "directory wolf exists" - cd wolf + - git checkout devel - git pull - git checkout $WOLF_CORE_BRANCH - else diff --git a/CMakeLists.txt b/CMakeLists.txt index af8c10fd4b105dd9da6a0806f583b710bb2b8bd6..bafc94df4f1ae42559e9769c381573c587df35ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) project(wolf_ros_node) ## Compile as C++11, supported in ROS Kinetic and newer -add_compile_options(-std=c++11) +add_compile_options(-std=c++14) # SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/wolf_ros_wrapper/cmake_modules") ## Find catkin macros and libraries