From 3505162cccef3bc58cbbde01244719bcc2253b4e Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 7 Feb 2024 13:01:47 +0100
Subject: [PATCH] Updated pipeline
---
.docs/requirements.txt | 7 -------
.gitlab-ci.yml | 12 ++++++------
2 files changed, 6 insertions(+), 13 deletions(-)
delete mode 100644 .docs/requirements.txt
diff --git a/.docs/requirements.txt b/.docs/requirements.txt
deleted file mode 100644
index 1df697b8b2..0000000000
--- a/.docs/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-mkdocs==1.4.3
-mkdocs-material==9.1.17
-mkdocs-with-pdf==0.9.3
-mkdocs-material-extensions>=1.0.3
-requests>=2.27.0
-py-dotenv>=0.1
-python-dotenv==1.0.0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84dafc88bf..beb1f3ceab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
TRIVY_CACHE_DIR: ".trivycache/"
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
- APP_VERSION: "1.4.1"
- CHART_VERSION: "1.4.1"
+ APP_VERSION: "1.4.0"
+ CHART_VERSION: "1.4.0"
image: debian:12-slim
@@ -598,7 +598,7 @@ docs-registry:
- release-v1.3
- release-v1.4
script:
- - pip install pipenv && pipenv install --dev --system --deploy
+ - pip install -r ./requirements.txt
- python3 .docs/docker/release.py
cache:
paths:
@@ -624,7 +624,7 @@ docs-latest:
script:
- apt-get update && apt-get install -y git make sed
- git fetch && git checkout master
- - pip install pipenv && pipenv install --dev --system --deploy
+ - pip install -r ./requirements.txt
- mkdir -p ./final
- sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
- cp ./.docs/redirect.html ./final/index.html
@@ -655,7 +655,7 @@ docs-1.3:
script:
- apt-get update && apt-get install -y git make wget
- git fetch && git checkout release-v1.3
- - pip install -r ./.docs/requirements.txt
+ - pip install -r ./requirements.txt
- wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
- mkdir -p ./final
- mkdocs build && cp -r ./site ./final/1.3.0
@@ -684,7 +684,7 @@ docs-1.4:
script:
- apt-get update && apt-get install -y git make sed wget
- git fetch && git checkout release-v1.4
- - pip install pipenv && pipenv install --dev --system --deploy
+ - pip install -r ./requirements.txt
- wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
- mkdir -p ./final
- find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;
--
GitLab