From c098939e3147a3ddcc6244abe155c4cad4d11432 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 25 Mar 2022 15:35:01 +0100
Subject: [PATCH] Update pages build.
---
.gitlab-ci.yml | 19 +++++++++++--------
pages/main.py | 2 +-
pages/requirements.txt | 1 +
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58bc800..87d2c9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ ragdoc_view:
paths:
- "pages/docs/ragdoc"
-pages:
+.pages-template:
image: python:3.10.0-bullseye
stage: publish
needs:
@@ -111,6 +111,15 @@ pages:
- pip install -r pages/requirements.txt
script:
- cd pages && mkdocs build
+
+pages-dry-run:
+ extends: .pages-template
+ except:
+ - dev
+ - master
+
+pages-master:
+ extends: .pages-template
artifacts:
paths:
- public/
@@ -118,13 +127,7 @@ pages:
- master
pages-dev:
- image: python:3.10.0-bullseye
- stage: publish
- needs:
- - ragdoc_view
- - test
- before_script:
- - pip install -r pages/requirements.txt
+ extends: .pages-template
script:
- cd pages && mkdocs build
- echo "UPSTREAM_JOB_ID=$CI_JOB_ID" >> build.env
diff --git a/pages/main.py b/pages/main.py
index 34fc17a..b5160b3 100644
--- a/pages/main.py
+++ b/pages/main.py
@@ -1,6 +1,6 @@
import os
-ragconnectVersionFileName = '../ragconnect.base/src/main/resources/ragConnectVersion.properties'
+ragconnectVersionFileName = '../ragconnect.base/src/main/resources/ragconnectVersion.properties'
def get_version():
diff --git a/pages/requirements.txt b/pages/requirements.txt
index 43e5e82..8784b22 100644
--- a/pages/requirements.txt
+++ b/pages/requirements.txt
@@ -2,3 +2,4 @@ mkdocs==1.2.2
mkdocs-git-revision-date-localized-plugin==0.10.3
mkdocs-macros-plugin==0.6.3
mike==1.1.2
+Jinja2==2.11.2
--
GitLab