diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65be5602a8e17b49dca77603899216467aabeae8..2d704e580b4ea5180c36fede5e8b7e1b639f24b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,10 +69,10 @@ stages: - git checkout devel - git pull - git checkout $WOLF_CORE_BRANCH + - git pull - 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 - - git checkout $WOLF_CORE_BRANCH - fi - mkdir -pv build - cd build @@ -85,9 +85,12 @@ stages: - if [ -d imu ]; then - echo "directory imu exists" - cd imu + - git checkout devel + - git pull + - git checkout $WOLF_IMU_BRANCH - git pull - 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 - fi - mkdir -pv build @@ -108,9 +111,9 @@ stages: ############ LICENSE HEADERS ############ license_headers: stage: license - image: labrobotica/wolf_deps:16.04 + image: labrobotica/wolf_deps:20.04 cache: - - key: wolf-xenial + - key: wolf-focal paths: - ci_deps/wolf/ except: @@ -121,27 +124,6 @@ license_headers: script: - *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 ############ build_and_test:bionic: image: labrobotica/wolf_deps:18.04