From 68e134605a1cf874ca0d319911990b17a0b4a31a Mon Sep 17 00:00:00 2001 From: Olivier Stasse <ostasse@laas.fr> Date: Fri, 20 Apr 2018 10:47:06 +0200 Subject: [PATCH] [gitlab-ci] Update from rainboard. --- .gitlab-ci.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c95a91..3abd1e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,16 @@ variables: - GIT_SSL_NO_VERIFY: "true" GIT_SUBMODULE_STRATEGY: "recursive" GIT_DEPTH: "3" NAMESPACE: pyrene-dev PROJECT: talos_metapkg_ros_control_sot - IMAGE: "${CI_REGISTRY}/${NAMESPACE}/${PROJECT}" + REGISTRY: gepgitlab.laas.fr:4567 + IMAGE: "${REGISTRY}/${NAMESPACE}/${PROJECT}" + CCACHE_BASEDIR: "${CI_PROJECT_DIR}" + CCACHE_DIR: "${CI_PROJECT_DIR}/ccache" cache: paths: - - build/ccache + - ccache .robotpkg-talos-metapkg-ros-control-sot: &robotpkg-talos-metapkg-ros-control-sot @@ -16,18 +18,16 @@ cache: ROBOTPKG: talos-metapkg-ros-control-sot CATEGORY: wip before_script: - - mkdir -p build/ccache - - cd build - - export CCACHE_BASEDIR=${PWD} - - export CCACHE_DIR=${PWD}/ccache + - mkdir -p ccache script: - cd /root/robotpkg/${CATEGORY}/${ROBOTPKG} - git pull - - echo "MASTER_REPOSITORY = git ${CI_PROJECT_DIR}" >> Makefile - - echo "REPOSITORY.talos-metapkg-ros-control-sot = git ${CI_PROJECT_DIR}" >> /opt/openrobots/etc/robotpkg.conf - - make checkout + - make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}" - make install - - cd work.*/${PROJECT}*/ + - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME) + - make check + - make doc + - mv doc/doxygen-html ${CI_PROJECT_DIR} except: - gh-pages @@ -36,10 +36,19 @@ robotpkg-talos-metapkg-ros-control-sot-14.04: <<: *robotpkg-talos-metapkg-ros-control-sot image: ${IMAGE}:14.04 + robotpkg-talos-metapkg-ros-control-sot-16.04: <<: *robotpkg-talos-metapkg-ros-control-sot image: ${IMAGE}:16.04 - + artifacts: + expire_in: 1 day + paths: + - doxygen-html/ + + robotpkg-talos-metapkg-ros-control-sot-dubnium: <<: *robotpkg-talos-metapkg-ros-control-sot image: ${IMAGE}:dubnium + + + -- GitLab