aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2020-06-22 11:10:29 +0200
committerMarge Bot <[email protected]>2020-07-01 14:31:38 +0000
commit8774707b1e32aede2c906b0358159790d09928a1 (patch)
tree2b77df8ee3a6fdba060b69c6fb30e4b9027a0a24 /.gitlab-ci.yml
parent24fe9f43e568bc44b6be380f659da3571b35ad16 (diff)
ci: test docs for non-master builds
This ensures that we test on CI before merge-requests gets merged. Reviewed-by: Michel Dänzer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5469>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca9a22358c3..16bcc9ab10a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,13 +24,16 @@ stages:
- virgl
- success
-pages:
+.docs-base:
image: alpine
stage: deploy
script:
- apk --no-cache add py3-pip
- pip3 install sphinx sphinx_rtd_theme
- sphinx-build -b html docs public
+
+pages:
+ extends: .docs-base
artifacts:
paths:
- public
@@ -41,6 +44,16 @@ pages:
- docs/**/*
- .gitlab-ci.yml
+test-docs:
+ extends: .docs-base
+ except:
+ refs:
+ - master@mesa/mesa
+ only:
+ changes:
+ - docs/**/*
+ - .gitlab-ci.yml
+
# When to automatically run the CI
.ci-run-policy:
rules: