diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b9db83e6dd7164dd2a4b7ee4af680a37f44d146..97de5ce07190f1af6780e80115c6799aa0660b25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -572,9 +572,9 @@ release-docs: - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa - echo "$CI_KEY_PUBLIC" > /root/.ssh/id_rsa.pub - echo "$CI_DOC_ID" > ~/.ssh/known_hosts - - tar czfv ./final.tar.gz ./final + - tar czf ./final.tar.gz ./final - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz" - - "ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP 'rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/*; tar xzfv ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo; rm -rf ./final'" + - "ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP 'rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/*; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo; rm -rf ./final'" release-libs: stage: release diff --git a/build-docs.sh b/build-docs.sh index ffc17120b0e452732d8dde9688b75a07a23ad24d..15a81eb54ca2159008879a41d255df9759e9c41e 100644 --- a/build-docs.sh +++ b/build-docs.sh @@ -16,9 +16,7 @@ function generate_sphinx { git reset --hard && git checkout "$BRANCH" pip install -r ./requirements.txt > /dev/null mkdir -p ./final - if [ "$1" = "latest" ]; then - sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" ./lib/python/setup.py ./lib/python/pyproject.toml ./lib/python/docs/conf.py ./lib/python/docs/index.rst ./lib/python/docs/index.rst - fi + sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" ./lib/python/setup.py ./lib/python/pyproject.toml ./lib/python/docs/conf.py ./lib/python/docs/index.rst ./lib/python/docs/index.rst sphinx-apidoc -o ./lib/python/docs/source ./lib/python/dbrepo sphinx-build -M html ./lib/python/docs/ ./lib/python/docs/build/ cp -r ./lib/python/docs/build/html "./final/$1/sphinx" @@ -90,6 +88,7 @@ for i in "${!versions[@]}"; do version="${versions[i]}" generate_api "$version" generate_docs "$version" + generate_sphinx "$version" || true done diff --git a/requirements.txt b/requirements.txt index 14523decbf70d74f048b2f1e1b294300ffa99f77..6bfd02cb2349bbbd7a967948c355411908a48054 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,8 @@ requests==2.31.0 build==1.1.1 setuptools==69.2.0 twine==5.0.0 -furo==2024.1.29 \ No newline at end of file +furo==2024.1.29 +requests==2.31.0 +pika==1.3.2 +pydantic==2.6.4 +tuspy==1.0.3 \ No newline at end of file