Skip to content
Snippets Groups Projects
Commit cb7f9558 authored by Simon Mazenoux's avatar Simon Mazenoux
Browse files

Merge branch 'dev' into 'master'

Merge master into dev

See merge request !379
parents 52349477 f046f44d
No related branches found
No related tags found
1 merge request!379Merge master into dev
Pipeline #8186728 passed
......@@ -111,34 +111,25 @@ mypy:
- mypy --version
- mypy
build_docs:
stage: build
script:
- pip install mkdocs mkdocs-material mkdocstrings[python]
- mkdocs build -d doc/
artifacts:
paths:
- doc
expire_in: 3 days
build_wheel:
stage: build
extends: .acc_py_build_wheel
rules:
- if: $CI_COMMIT_TAG
deploy_docs:
pages:
stage: deploy
before_script:
- pip install mkdocs mkdocs-material mkdocstrings[python]
script:
- mv doc/ public/
- mkdocs build -d public
artifacts:
paths:
- public
expire_in: 1 hour
dependencies:
- build_wheel
rules:
- if: $CI_COMMIT_BRANCH == "master"
- if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG
deploy_accpy:
stage: deploy
......
......@@ -21,8 +21,8 @@ markdown_extensions:
theme:
name: material
logo: images/logo-bis.png
favicon: images/logo.png
logo: assets/logo-bis.png
favicon: assets/logo.png
palette:
primary: custom
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment