Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 17:16:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 17:16:34 +0300
commit4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (patch)
tree2b256ff8dfe63dafe7f42b0d995f9e74fd1dc48b /.gitlab/ci/docs.gitlab-ci.yml
parentbd860c22f6a4b9473cbddd34a53eead8235a7ea1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/docs.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/docs.gitlab-ci.yml39
1 files changed, 11 insertions, 28 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 22e752ae0b0..87023da3c24 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -2,6 +2,12 @@
extends:
- .default-tags
- .default-retry
+ - .only-docs-changes
+ only:
+ refs:
+ - merge_requests
+ variables:
+ - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org"
image: ruby:2.6-alpine
stage: review
dependencies: []
@@ -19,55 +25,32 @@
- apk add --update openssl
- wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/trigger-build-docs
- chmod 755 trigger-build-docs
-
-# 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:
- extends:
- - .review-docs
- - .except-docs-qa
- script:
- gem install gitlab --no-document
- - ./trigger-build-docs deploy
- when: manual
- only:
- - branches@gitlab-org/gitlab-foss
- - branches@gitlab-org/gitlab
# Always trigger a docs build in gitlab-docs only on docs-only branches.
# Useful to preview the docs changes live.
review-docs-deploy:
- extends:
- - .review-docs
- - .except-qa
+ extends: .review-docs
script:
- - gem install gitlab --no-document
- ./trigger-build-docs deploy
- only:
- - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-foss
- - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab
+ when: manual
# Cleanup remote environment of gitlab-docs
review-docs-cleanup:
- extends:
- - .review-docs
- - .except-qa
+ extends: .review-docs
environment:
name: review-docs/$CI_COMMIT_REF_SLUG
action: stop
script:
- - gem install gitlab --no-document
- ./trigger-build-docs cleanup
when: manual
- only:
- - branches@gitlab-org/gitlab-foss
- - branches@gitlab-org/gitlab
docs lint:
extends:
- .default-tags
- .default-retry
- - .except-qa
+ - .default-only
+ - .only-docs-changes
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint"
stage: test
dependencies: []