From c95eef43c7e630f2c035726b58f170c29b88ae6e Mon Sep 17 00:00:00 2001
From: amichelo <andrea.michelotti@lnf.infn.it>
Date: Thu, 21 Apr 2022 18:52:44 +0200
Subject: [PATCH] force update jchaos
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffbdc50..af954f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -256,7 +256,8 @@ ubuntu1804_x86_64:
- GITTAG=`git describe --abbrev=0`
- echo -e "GITHASH:$GITHASH\nGITTAG:$GITTAG" >> $INSTALL_DIR/VERSION
- export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
- - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
+ - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
+ - cd html/chaos_dashboard/jchaos;git checkout $CI_COMMIT_REF_NAME;cd -
- if ! cmake -DKAFKA_RDK_ENABLE=ON -DCMAKE_BUILD_TYPE=Release -DCHAOS_EPICS_SUPPORT=ON -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DCHAOS_DRIVER_LUMINOMETER=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye495 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
- if ! make -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz `find . -name "*.log"` $INSTALL_DIR/bundle.compilation.log;exit 1;fi
- ./tools/strip_symbols.sh $INSTALL_DIR
@@ -291,7 +292,8 @@ ubuntu2004_x86_64:
- GITTAG=`git describe --abbrev=0`
- echo -e "GITHASH:$GITHASH\nGITTAG:$GITTAG" >> $INSTALL_DIR/VERSION
- export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
- - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
+ - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
+ - cd html/chaos_dashboard/jchaos;git checkout $CI_COMMIT_REF_NAME;cd -
# -DCMAKE_BUILD_TYPE=Release Debug, Release, RelWithDebInfo and MinSizeRel
- if ! cmake -DKAFKA_RDK_ENABLE=ON -DCMAKE_BUILD_TYPE=Release -DCHAOS_EPICS_SUPPORT=ON -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DCHAOS_DRIVER_LUMINOMETER=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye495 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
- if ! make -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz `find . -name "*.log"` $INSTALL_DIR/bundle.compilation.log;exit 1;fi
@@ -377,6 +379,7 @@ centos7_x86_64:
- echo -e "GITHASH:$GITHASH\nGITTAG:$GITTAG" >> $INSTALL_DIR/VERSION
- export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
- cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
+ - cd html/chaos_dashboard/jchaos;git checkout $CI_COMMIT_REF_NAME;cd -
- export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc;export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++
- if ! cmake -DKAFKA_RDK_ENABLE=ON -DCMAKE_BUILD_TYPE=Release -DCHAOS_EPICS_SUPPORT=ON -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DCHAOS_DRIVER_LUMINOMETER=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye494 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
- if ! make -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz `find . -name "*.log"` $INSTALL_DIR/bundle.compilation.log;exit 1;fi
--
GitLab