diff --git a/general/chroot_wrap.sh b/general/chroot_wrap.sh index 07deace7b77a3f6c41f9a85b304d6f3cb988ad84..c1b8d102b27fe8f04b96453b0ef8e06a4ab7aef5 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 6b325ef8d4f5d0dbf3f1e2d6b80f6c759bb926e2..41f0f7e55881bd7fb2f1a6f4dec8d4abcf71fe91 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"