Commit 38160e8d authored by Timothée Mazzucotelli's avatar Timothée Mazzucotelli

Merge branch '11-fix-pages-job' into 'master'

Resolve "Fix pages job" (#11)

Closes #11

See merge request !7
parents b6f81f6b 52b8cded
Pipeline #1605 passed with stages
in 8 minutes and 48 seconds
# Setup some variables and caches # Setup variables and caches ---------------------------------------------------
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache" PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache"
...@@ -7,24 +7,14 @@ cache: ...@@ -7,24 +7,14 @@ cache:
- "$CI_PROJECT_DIR/pip-cache" - "$CI_PROJECT_DIR/pip-cache"
key: "$CI_PROJECT_ID" key: "$CI_PROJECT_ID"
# Declare the stages # Declare the stages -----------------------------------------------------------
stages: stages:
- prepare
- lint - lint
- test - test
- build - build
- deploy - deploy
# PREPARE stage # LINT stage -------------------------------------------------------------------
prepare:
stage: prepare
image: python:3.5
script:
- pip install -U pip setuptools tox detox
- pip install -r requirements.txt
- pip install -r docs/requirements.txt
# CHECK stage
setup: setup:
image: python:3.5 image: python:3.5
stage: lint stage: lint
...@@ -55,8 +45,11 @@ docs: ...@@ -55,8 +45,11 @@ docs:
- pip install tox - pip install tox
script: tox -e docs script: tox -e docs
allow_failure: true allow_failure: true
artifacts:
paths:
- dist/docs/
# TEST stage # TEST stage -------------------------------------------------------------------
py34-django111: py34-django111:
image: python:3.4 image: python:3.4
stage: test stage: test
...@@ -137,7 +130,7 @@ py37-django20: ...@@ -137,7 +130,7 @@ py37-django20:
paths: paths:
- .coverage.* - .coverage.*
# BUILD stage # BUILD stage ------------------------------------------------------------------
build: build:
image: docker:latest image: docker:latest
services: services:
...@@ -145,7 +138,7 @@ build: ...@@ -145,7 +138,7 @@ build:
stage: build stage: build
script: echo "Build Docker images" script: echo "Build Docker images"
# DEPLOY stage # DEPLOY stage -----------------------------------------------------------------
deploy_staging: deploy_staging:
stage: deploy stage: deploy
script: script:
...@@ -169,7 +162,9 @@ deploy_prod: ...@@ -169,7 +162,9 @@ deploy_prod:
pages: pages:
stage: deploy stage: deploy
image: python:3.5
dependencies: dependencies:
- docs
- py34-django111 - py34-django111
- py35-django111 - py35-django111
- py36-django111 - py36-django111
...@@ -182,10 +177,9 @@ pages: ...@@ -182,10 +177,9 @@ pages:
- pip install tox - pip install tox
script: script:
- tox -e report - tox -e report
- mv htmlcov/ public/ - mv htmlcov/ dist/docs/
- mv dist/docs/ public/
artifacts: artifacts:
paths: paths:
- public - public
expire_in: 30 days expire_in: 30 days
only:
- master
...@@ -16,3 +16,10 @@ Indices and tables ...@@ -16,3 +16,10 @@ Indices and tables
* :ref:`genindex` * :ref:`genindex`
* :ref:`modindex` * :ref:`modindex`
* :ref:`search` * :ref:`search`
Code Coverage
=============
`Coverage index`_.
.. _`Coverage index`: htmlcov/index.html
Markdown is supported
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