From b8701c241715acab07e932393c9bd6a819394aba Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 7 Mar 2024 13:41:32 +0000
Subject: [PATCH] Updated cache
---
.docs/build-website.sh | 13 +++++++++----
.gitlab-ci.yml | 9 ++++-----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.docs/build-website.sh b/.docs/build-website.sh
index 477eff8e7c..62bdd05180 100755
--- a/.docs/build-website.sh
+++ b/.docs/build-website.sh
@@ -3,11 +3,14 @@
OVERRIDES_MAIN_HTML=""
SCRIPTS_EXTRA_JS=""
+function clean_cache {
+ echo "Removing cache from directory ./site"
+ rm -rf ./site
+}
+
function generate_docs {
BRANCH="release-$1"
echo "==================================================="
- echo "Removing cache from directory ./site"
- rm -rf ./site
echo "Building DOCS for version $1 on branch $BRANCH"
echo "==================================================="
git reset --hard && git checkout "$BRANCH"
@@ -26,13 +29,12 @@ function generate_docs {
find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/$1/g" {} \;
mkdocs build > /dev/null && cp -r ./site "./final/$1"
cp -r "./swagger/$1" "./final/$1/swagger"
+ clean_cache
}
function generate_api {
BRANCH="release-$1"
echo "==================================================="
- echo "Removing cache from directory ./site"
- rm -rf ./site
echo "Building API for version $1 on branch $BRANCH"
echo "==================================================="
git reset --hard && git checkout "$BRANCH"
@@ -40,6 +42,7 @@ function generate_api {
find ./site -type f -exec sed -i -e "s/__APPVERSION__/$1/g" {} \;
mkdir -p "./swagger/$1"
cp -r ./site/* "./swagger/$1/"
+ clean_cache
}
# usage
@@ -76,4 +79,6 @@ done
echo "==================================================="
echo "Moving default version $APP_VERSION docs to /"
cp -r ./final/${APP_VERSION}/* ./final/
+echo "Compress final documentation"
+tar czfv final.tar.gz ./final
echo "==================================================="
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d3490ef7..cfa7d1ce9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -470,7 +470,7 @@ stages:
# - python3 .docs/docker/release.py
docs-docs:
- stage: release
+ stage: docs
image: docker.io/python:3.11-slim
only:
refs:
@@ -480,12 +480,12 @@ docs-docs:
- make docs
cache:
paths:
- - ./final
+ - ./final.tar.gz
artifacts:
when: always
paths:
- - ./final
- expire_in: 1 days
+ - ./final.tar.gz
+ expire_in: 1 hour
release-images:
stage: release
@@ -535,6 +535,5 @@ 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
- "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'"
--
GitLab