From 1e6cac03546821e0447b6eab25a7545a401f13d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Thu, 16 Dec 2021 09:50:25 +0100
Subject: [PATCH] CI: image with 20.04 and solved small bug
---
.gitlab-ci.yml | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd31833a2..16f384c00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ stages:
- if [ -d wolf ]; then
- echo "directory wolf exists"
- cd wolf
+ - git checkout devel
- git pull
- git checkout $WOLF_CORE_BRANCH
- else
@@ -161,4 +162,25 @@ build_and_test:bionic:
- *install_visionutils_definition
- ldconfig # update links (shared libraries)
script:
- - *build_and_test_definition
\ No newline at end of file
+ - *build_and_test_definition
+
+############ UBUNTU 20.04 TESTS ############
+build_and_test:focal:
+ image: labrobotica/wolf_vision_deps:20.04
+ stage: build_and_test
+ cache:
+ - key: wolf-focal
+ paths:
+ - ci_deps/wolf/
+ - key: visionutils-focal
+ paths:
+ - ci_deps/vision_utils/
+ except:
+ - master
+ before_script:
+ - *preliminaries_definition
+ - *install_wolf_definition
+ - *install_visionutils_definition
+ - ldconfig # update links (shared libraries)
+ script:
+ - *build_and_test_definition
--
GitLab