Skip to content
Snippets Groups Projects
Verified Commit 2da9f2cd authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'dev'

parents c0578322 4c1280a1
Branches
Tags
3 merge requests!237Resolve "Proxy settings",!232Draft: Master,!231CI: Remove build for log-service
...@@ -593,11 +593,11 @@ docs-latest: ...@@ -593,11 +593,11 @@ docs-latest:
- apt-get update && apt-get install -y git make sed - apt-get update && apt-get install -y git make sed
- git fetch && git checkout master - git fetch && git checkout master
- pip install -r ./requirements.txt - pip install -r ./requirements.txt
- mkdir -p ./final - mkdir -p ./final/{latest,1.3}
- find ./.docs -type f -exec sed -i -e "s/\$TAG/latest/g" {} \; - sed -i -e "s/\$TAG/${VERSION}/g"
- find ./.docs -type f -exec sed -i -e "s/\$VERSION/${VERSION}/g" {} \; - sed -i -e "s/\$VERSION/${VERSION}/g"
- mkdocs build && cp -r ./site ./final/latest - mkdocs build && cp -r ./site ./final/latest
- cp ./.docs/redirect.html ./final/index.html - cp ./.docs/redirect.html ./final/index.html ./final/1.3/index.html
- cp -r ./swagger/latest ./final/latest/swagger - cp -r ./swagger/latest ./final/latest/swagger
cache: cache:
paths: paths:
...@@ -654,7 +654,8 @@ docs-1.4: ...@@ -654,7 +654,8 @@ docs-1.4:
- pip install -r ./.docs/requirements.txt - pip install -r ./.docs/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 - 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 - mkdir -p ./final
- find ./.docs -type f -exec sed -i -e "s/\$TAG/${VERSION}/g" {} \; - sed -i -e "s/\$TAG/${VERSION}/g"
- sed -i -e "s/\$VERSION/${VERSION}/g"
- mkdocs build && cp -r ./site ./final/${VERSION} - mkdocs build && cp -r ./site ./final/${VERSION}
- cp -r ./swagger/${VERSION} ./final/${VERSION}/swagger - cp -r ./swagger/${VERSION} ./final/${VERSION}/swagger
cache: cache:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment