diff options
author | Trevor Bramwell <trevor@bramwell.net> | 2021-06-25 23:39:12 +0000 |
---|---|---|
committer | Trevor Bramwell <trevor@bramwell.net> | 2021-06-25 23:39:12 +0000 |
commit | 8147d3cf75110e7dc786bfe42b11f55ed259307b (patch) | |
tree | 945a1d87a6eee230385f63958f582fdddf8db90d | |
parent | 0aa0d35719fe07d8610fe1c075e6e343d677e671 (diff) | |
parent | df0c593bae69a232fb054a33a3c932187c48f935 (diff) |
Merge branch 'gitlab-ci' into 'master'
Gitlab-CI Configuration for Documentation Builds
See merge request anuket/opnfvdocs!9
-rw-r--r-- | .gitlab-ci.yml | 13 | ||||
-rw-r--r-- | docs/requirements.txt (renamed from etc/requirements.txt) | 0 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bc0893c3..112bd39cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,12 @@ -# This file is a template, and might need editing before it works on your project. +# Docs jobs +# +# On Merge requests, tags and merges: +# - Run tox +# - Build documentation +# On Merges and Pull Requests: +# - Run code quality analysis +--- include: - template: Jobs/Code-Quality.gitlab-ci.yml + - template: Jobs/Code-Quality.gitlab-ci.yml + - project: anuket-transition/releng + file: '/gitlab-templates/RTD.gitlab-ci.yml' diff --git a/etc/requirements.txt b/docs/requirements.txt index 734f07f97..734f07f97 100644 --- a/etc/requirements.txt +++ b/docs/requirements.txt |