Commit 72553294 authored by Loic Huder's avatar Loic Huder
Browse files

CI: Integrated build_docs into pages job and used artifacts to avoid cloning the repo twice

Former-commit-id: 59988df3
parent ba48f403
...@@ -42,21 +42,10 @@ test_with_coverage: ...@@ -42,21 +42,10 @@ test_with_coverage:
artifacts: artifacts:
paths: paths:
- make_doc.sh # Keep doc script and folder for pages
- docs
- htmlcov - htmlcov
coverage: "/TOTAL.+ ([0-9]{1,3}%)/" coverage: "/TOTAL.+ ([0-9]{1,3}%)/"
only:
- master
- web
build_docs:
stage: test
script:
- ./make_doc.sh
artifacts:
paths:
- docs/html
only: only:
- master - master
- web - web
...@@ -66,6 +55,7 @@ pages: ...@@ -66,6 +55,7 @@ pages:
variables: variables:
GIT_STRATEGY: none # Skip all git operations as this stage only works with artifacts GIT_STRATEGY: none # Skip all git operations as this stage only works with artifacts
script: script:
- ./make_doc.sh
- mkdir .public - mkdir .public
- ls docs/html/ - ls docs/html/
- cp -r docs/html/* .public - cp -r docs/html/* .public
...@@ -76,7 +66,6 @@ pages: ...@@ -76,7 +66,6 @@ pages:
- public - public
dependencies: dependencies:
- test_with_coverage - test_with_coverage
- build_docs
only: only:
- master - master
- web - web
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment