summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-05-16 16:16:14 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-05-16 16:33:52 +0200
commit0c59aa0a46cb68ec379d10aa49397b7480724023 (patch)
tree76f6276ff86459e85c2b7d0276685cb86af60119 /.gitlab-ci.yml
parent3d44ec3f4aa7180f2226f09064abe281c6b9d7be (diff)
downloadgitlab-ce-0c59aa0a46cb68ec379d10aa49397b7480724023.tar.gz
Add more choices to name the branch for docs only tests
http://rubular.com/r/51mKdLm6RF
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5463a020de7..1322843b592 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ stages:
# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
.except-docs: &except-docs
except:
- - /^docs\/.*/
+ - /(^docs[\/-].*|.*-docs$)/
.rspec-knapsack: &rspec-knapsack
stage: test
@@ -309,7 +309,7 @@ downtime_check:
- master
- tags
- /^[\d-]+-stable(-ee)?$/
- - /^docs\/*/
+ - /(^docs[\/-].*|.*-docs$)/
ee_compat_check:
<<: *rake-exec