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

Merge branch 'devel' into 'master'

new tag

See merge request !19
parents b32654e7 32db0b13
No related branches found
No related tags found
1 merge request!19new tag
...@@ -69,10 +69,10 @@ stages: ...@@ -69,10 +69,10 @@ stages:
- git checkout devel - git checkout devel
- git pull - git pull
- git checkout $WOLF_CORE_BRANCH - git checkout $WOLF_CORE_BRANCH
- git pull
- else - else
- git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git - git clone -b $WOLF_CORE_BRANCH ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git
- cd wolf - cd wolf
- git checkout $WOLF_CORE_BRANCH
- fi - fi
- mkdir -pv build - mkdir -pv build
- cd build - cd build
...@@ -85,9 +85,12 @@ stages: ...@@ -85,9 +85,12 @@ stages:
- if [ -d imu ]; then - if [ -d imu ]; then
- echo "directory imu exists" - echo "directory imu exists"
- cd imu - cd imu
- git checkout devel
- git pull
- git checkout $WOLF_IMU_BRANCH
- git pull - git pull
- else - else
- git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/plugins/imu.git - git clone -b $WOLF_IMU_BRANCH ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/plugins/imu.git
- cd imu - cd imu
- fi - fi
- mkdir -pv build - mkdir -pv build
...@@ -108,9 +111,9 @@ stages: ...@@ -108,9 +111,9 @@ stages:
############ LICENSE HEADERS ############ ############ LICENSE HEADERS ############
license_headers: license_headers:
stage: license stage: license
image: labrobotica/wolf_deps:16.04 image: labrobotica/wolf_deps:20.04
cache: cache:
- key: wolf-xenial - key: wolf-focal
paths: paths:
- ci_deps/wolf/ - ci_deps/wolf/
except: except:
...@@ -121,27 +124,6 @@ license_headers: ...@@ -121,27 +124,6 @@ license_headers:
script: script:
- *license_header_definition - *license_header_definition
############ UBUNTU 16.04 TESTS ############
build_and_test:xenial:
image: labrobotica/wolf_deps:16.04
stage: build_and_test
cache:
- key: wolf-xenial
paths:
- ci_deps/wolf/
- key: imu-xenial
paths:
- ci_deps/imu/
except:
- master
before_script:
- *preliminaries_definition
- *install_wolf_definition
- *install_wolfimu_definition
- ldconfig # update links (shared libraries)
script:
- *build_and_test_definition
############ UBUNTU 18.04 TESTS ############ ############ UBUNTU 18.04 TESTS ############
build_and_test:bionic: build_and_test:bionic:
image: labrobotica/wolf_deps:18.04 image: labrobotica/wolf_deps:18.04
......
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