From b259da286b6f8e40d2d21d7f12f550688141b998 Mon Sep 17 00:00:00 2001 From: Aleksandr Vodianov <aleksandr.vodianov@demlabs.net> Date: Mon, 11 Oct 2021 19:57:21 +0300 Subject: [PATCH] upd --- general/chroot_wrap.sh | 2 +- general/update_dashboard.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/general/chroot_wrap.sh b/general/chroot_wrap.sh index 07deace..c1b8d10 100755 --- a/general/chroot_wrap.sh +++ b/general/chroot_wrap.sh @@ -46,7 +46,7 @@ for platform in $PLATFORMS; do unexport_variables "./prod_build/$platform/conf/*" done -if [[ $CI_COMMIT_REF_NAME == "support-5044" ]]; then +if [[ $CI_COMMIT_REF_NAME == "master" ]]; then ./prod_build/general/update_dashboard.sh fi diff --git a/general/update_dashboard.sh b/general/update_dashboard.sh index 6b325ef..41f0f7e 100755 --- a/general/update_dashboard.sh +++ b/general/update_dashboard.sh @@ -4,7 +4,7 @@ git clone https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellfram cd cellframe-dashboard git remote set-url origin https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git -git checkout support-4958 +git checkout master versionPatch=$(cat config.pri | grep 'VER_PAT =' | cut -d'=' -f 2) echo "version patch = $versionPatch" -- GitLab