Merge branch 'main' into develop

docs/changelog.md

@@ -23,6 +23,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove dump scripts
 - Remove sctp-server scripts
 
+## [0.7.0-Rebirth] - 13.10.2022
+### Breaking actions
+- Remove sctp-server scripts from projects that use ostis-web-platform
+- Use py-sc-client and ts-sc-client for sc-server instead of sctp-clients for sctp-server
+
+### Added
+- Add latex documentation from OSTIS Standard
+- Add CI
+
+### Changed
+- Unify config file for sc-server and sc-builder
+
+### Removed
+- Remove sctp-server scripts
+
+
 ## [0.7.0-Rebirth] - 13.10.2022
 ### Breaking actions
 - Remove sctp-server scripts from projects that use ostis-web-platform
@@ -44,6 +60,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Set modules links to ostis-ai repos
+- Set sc-machine to 0.6.1
+- Set sc-web to 0.6.1
+- Set ims.ostis.kb to 0.2.1
 
 ### Removed
 - Remove yarn web interface build

scripts/prepare.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
+<<<<<<< HEAD
 YELLOW='\033[01;33m'
 NC='\033[0m' # No Color
 echo -e "${YELLOW}[WARNING] This script was deprecated in ostis-web-platform 0.8.0.
@@ -13,10 +14,18 @@ if [[ -z "${PLATFORM_PATH}" || -z "${SC_MACHINE_PATH}" || -z "${SC_WEB_PATH}" ]]
 then
   source "${CURRENT_DIR}/set_vars.sh"
 fi
+=======
+st=1
+>>>>>>> main
 
 build_kb=1
 build_sc_machine=1
 build_sc_web=1
+<<<<<<< HEAD
+=======
+
+set -eo pipefail
+>>>>>>> main
 
 while [ "$1" != "" ]; do
 	case $1 in
@@ -33,6 +42,7 @@ while [ "$1" != "" ]; do
 	shift
 done
 
+<<<<<<< HEAD
 clone_project()
 {
   if [ ! -d "$2" ]; then
@@ -41,19 +51,44 @@ clone_project()
   else
     printf "You can update %s manually.\n" "$2"
   fi
+=======
+stage()
+{
+	echo -en "[$1]\n"
+	let "st += 1"
+}
+
+clone_project()
+{
+	if [ ! -d "../$2" ]; then
+		printf "Clone %s\n" "$1"
+		git clone "$1" ../"$2"
+		cd ../"$2"
+		git checkout "$3"
+		cd -
+	else
+		echo -e "You can update $2 manualy\n"
+	fi
+>>>>>>> main
 }
 
 stage "Clone projects"
 
+<<<<<<< HEAD
 clone_project "${SC_MACHINE_REPO}" "${SC_MACHINE_PATH}" "${SC_MACHINE_BRANCH}"
 clone_project "${SC_WEB_REPO}" "${SC_WEB_PATH}" "${SC_WEB_BRANCH}"
+=======
+clone_project https://github.com/ostis-ai/sc-machine.git sc-machine 0.7.0-Rebirth
+clone_project https://github.com/ostis-ai/sc-web.git sc-web 0.7.0-Rebirth
+>>>>>>> main
 
 git submodule update --init --recursive
 
 stage "Prepare projects"
 
 prepare()
 {
+<<<<<<< HEAD
   echo -en "$1\n"
 }
 
@@ -71,13 +106,60 @@ fi
 
 if (( build_sc_web == 1 )); then
   prepare "SC-web"
+=======
+	echo -en "$1\n"
+}
+
+if (( $build_sc_machine == 1 )); then
+prepare "sc-machine"
+
+cd ../sc-machine
+git submodule update --init --recursive
+cd scripts
+./install_deps_ubuntu.sh --dev
+
+
+cd ..
+pip3 install setuptools wheel
+pip3 install -r requirements.txt
+
+
+cd scripts
+	./make_all.sh
+cd ..
+fi
+
+
+if (( $build_sc_web == 1 )); then
+prepare "sc-web"
+pip3 install --default-timeout=100 future
+>>>>>>> main
 
   "${SC_WEB_PATH}/scripts/install_deps_ubuntu.sh"
 
+<<<<<<< HEAD
   "${SC_WEB_PATH}/scripts/build_sc_web.sh"
 fi
 
 if (( build_kb == 1 )); then
   stage "Build knowledge base"
   "${PLATFORM_PATH}/scripts/build_kb.sh"
+=======
+cd ../sc-web/scripts
+
+./install_deps_ubuntu.sh --dev
+
+cd -
+cd ../sc-web
+pip3 install -r requirements.txt
+
+npm install
+npm run build
+fi
+
+if (( $build_kb == 1 )); then
+	stage "Build knowledge base"
+	cd ../scripts
+	./build_kb.sh
+>>>>>>> main
 fi