diff --git a/general/chroot_wrap.sh b/general/chroot_wrap.sh index dc35371cddb0f1083f1c2f46afb93f30420bc859..c1b8d102b27fe8f04b96453b0ef8e06a4ab7aef5 100755 --- a/general/chroot_wrap.sh +++ b/general/chroot_wrap.sh @@ -45,6 +45,11 @@ for platform in $PLATFORMS; do PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-) unexport_variables "./prod_build/$platform/conf/*" done + +if [[ $CI_COMMIT_REF_NAME == "master" ]]; then + ./prod_build/general/update_dashboard.sh +fi + #[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds. cd $wd diff --git a/general/update_dashboard.sh b/general/update_dashboard.sh new file mode 100755 index 0000000000000000000000000000000000000000..41f0f7e55881bd7fb2f1a6f4dec8d4abcf71fe91 --- /dev/null +++ b/general/update_dashboard.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +git clone https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git +cd cellframe-dashboard +git remote set-url origin https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git + +git checkout master + +versionPatch=$(cat config.pri | grep 'VER_PAT =' | cut -d'=' -f 2) +echo "version patch = $versionPatch" +let "versionPatch++" +echo "update version patch to $versionPatch" +sed -i "s/VER_PAT = [0-9]\+/VER_PAT = $versionPatch/g" config.pri + + +git add config.pri +git commit -m 'update version patch' +git push diff --git a/linux/debian/conf/dependencies b/linux/debian/conf/dependencies index 115dad27d858640f1d619067e40834e87de625b3..6e484949b2344ffc1e6067ce92b40ecace0c490e 100644 --- a/linux/debian/conf/dependencies +++ b/linux/debian/conf/dependencies @@ -1 +1 @@ -PKG_DEPS="libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute libpython3-dev" +PKG_DEPS="libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute libpython3-dev libpq-dev" diff --git a/linux/debian/scripts/compile_and_pack.sh b/linux/debian/scripts/compile_and_pack.sh index 2d4fd356b40ed9cd688d6a2e0fded062fe6e4909..96b70b206ff5b5e39587338fdb8c28eb6b11163f 100755 --- a/linux/debian/scripts/compile_and_pack.sh +++ b/linux/debian/scripts/compile_and_pack.sh @@ -63,9 +63,14 @@ error=0 mkdir -p packages substitute_pkgname_postfix && mkdir -p build && cd build && cmake ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ +&& cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? + +sed -i 's/#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/' ../CMakeLists.txt || error=$? +cmake ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ && cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && cd .. && rm -r build || error=$? exit $error + ### touch /etc/apt/sources.list.d/demlabs.list deb https://debian.pub.demlabs.net/ bionic main universe multiverse ### wget https://debian.pub.demlabs.net/debian.pub.demlabs.net.gpg