From 12eaa2415f60a3f27b870191c6eef11a26938ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu> Date: Fri, 12 Nov 2021 14:08:47 +0100 Subject: [PATCH] CI: using variable WOLF_CORE_BRANCH --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index faae1f9f6..c546b37ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,9 +26,11 @@ - echo "directory wolf exists" - cd wolf - git pull + - git checkout $WOLF_CORE_BRANCH - else - git clone 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 @@ -64,7 +66,7 @@ - make install ############ UBUNTU 16.04 TESTS ############ -wolf_build_and_test_none:xenial: +build_and_test:xenial: image: labrobotica/wolf_vision_deps:16.04 cache: - key: wolf-xenial @@ -84,7 +86,7 @@ wolf_build_and_test_none:xenial: - *build_and_test_definition ############ UBUNTU 18.04 TESTS ############ -wolf_build_and_test_none:bionic: +build_and_test:bionic: image: labrobotica/wolf_vision_deps:18.04 cache: - key: wolf-bionic -- GitLab