From de99b7ba9057eef8f809e920a93d06ecfdc21392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Lafoucri=C3=A8re?= Date: Mon, 1 Jul 2019 15:04:19 +0000 Subject: Refactor except code We repeat the same code in many places. With the support of multiple extends, we can clean up several jobs. --- .gitlab/ci/docs.gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.gitlab/ci/docs.gitlab-ci.yml') diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 4747e51f776..d7f8d70699b 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -12,7 +12,9 @@ # Trigger a manual docs build in gitlab-docs only on non docs-only branches. # Useful to preview the docs changes live. review-docs-deploy-manual: - <<: *review-docs + extends: + - .review-docs + - .no-docs-and-no-qa stage: build script: - gem install gitlab --no-document @@ -21,9 +23,6 @@ review-docs-deploy-manual: only: - branches@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ee - except: - - /(^docs[\/-].*|.*-docs$)/ - - /(^qa[\/-].*|.*-qa$)/ # Always trigger a docs build in gitlab-docs only on docs-only branches. # Useful to preview the docs changes live. -- cgit v1.2.3