Skip to content
Snippets Groups Projects
Commit 56c781c8 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'devel' of...

Merge branch 'devel' of ssh://gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_ros/wolf_ros_laser into devel
parents b0074e61 c4c44012
No related branches found
No related tags found
1 merge request!8Devel
...@@ -6,11 +6,10 @@ stages: ...@@ -6,11 +6,10 @@ stages:
############ YAML ANCHORS ############ ############ YAML ANCHORS ############
.print_variables_template: &print_variables_definition .print_variables_template: &print_variables_definition
# Print variables # Print variables
- echo $CI_COMMIT_BRANCH
- echo $WOLF_CORE_BRANCH - echo $WOLF_CORE_BRANCH
- echo $WOLF_LASER_BRANCH - echo $WOLF_LASER_BRANCH
- echo $WOLF_ROS_NODE_NODE - echo $WOLF_ROS_NODE_BRANCH
- echo $CI_COMMIT_BRANCH
- echo $WOLF_ROS_LASER_NODE
- echo $WOLF_ROS_LASER_BRANCH - echo $WOLF_ROS_LASER_BRANCH
- echo $LASERSCANUTILS_BRANCH - echo $LASERSCANUTILS_BRANCH
...@@ -81,8 +80,7 @@ stages: ...@@ -81,8 +80,7 @@ stages:
- if [ -d wolf ]; then - if [ -d wolf ]; then
- echo "directory wolf exists" - echo "directory wolf exists"
- cd wolf - cd wolf
- git checkout devel - git fetch --all
- git pull
- git checkout $WOLF_CORE_BRANCH - git checkout $WOLF_CORE_BRANCH
- git pull - git pull
- else - else
...@@ -101,8 +99,7 @@ stages: ...@@ -101,8 +99,7 @@ stages:
- if [ -d laser_scan_utils ]; then - if [ -d laser_scan_utils ]; then
- echo "directory laser_scan_utils exists" - echo "directory laser_scan_utils exists"
- cd laser_scan_utils - cd laser_scan_utils
- git checkout main - git fetch --all
- git pull
- git checkout $LASERSCANUTILS_BRANCH - git checkout $LASERSCANUTILS_BRANCH
- git pull - git pull
- else - else
...@@ -155,8 +152,7 @@ stages: ...@@ -155,8 +152,7 @@ stages:
- if [ -d laser ]; then - if [ -d laser ]; then
- echo "directory laser exists" - echo "directory laser exists"
- cd laser - cd laser
- git checkout devel - git fetch --all
- git pull
- git checkout $WOLF_LASER_BRANCH - git checkout $WOLF_LASER_BRANCH
- git pull - git pull
- else - else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment