diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58bc800e578ee0541a6d06d5ebbebcf4e378dba2..87d2c9ca04f5e7383dc6efd5e7a33d87f2d9b8c6 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 34fc17a618280621b5d737559c8a1839a9e019e7..b5160b33a32ca57e663f59e15277e99ba0464521 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 43e5e8286a08c67e0f31725821347f38ae4641ef..8784b220c5e49e6d50d0a0ea8a21eb34aacffda0 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