diff options
| author | Evan Read <eread@gitlab.com> | 2021-02-23 01:48:29 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2021-02-23 01:48:29 +0300 |
| commit | 358492cf4f49823c01f1323992c7e81ce4e5d795 (patch) | |
| tree | 0729b534da25af59bc88ef13d57bf34ade87fe17 | |
| parent | e5fdfac8f14f341c3941243321edcb93f89492f5 (diff) | |
| parent | b825ac71d269882f06166a1177b252d28b118bd2 (diff) | |
Merge branch 'docs-pipeline-variables' into 'master'
Move reused variables into the global variables
See merge request gitlab-org/gitlab-docs!1551
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9f36315..fe08dca0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,10 @@ variables: BRANCH_CHARTS: 'master' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' + ALPINE_VERSION: '3.12' + VALE_VERSION: '2.8.0' + MARKDOWNLINT_VERSION: '0.26.0' + RUBY_VERSION: '2.7.2' # # Retry a job automatically if it fails (2 times) @@ -307,8 +311,6 @@ test_EOL_whitespace: - .rules_chores - .cache_gem stage: test - variables: - MARKDOWNLINT_VERSION: '0.26.0' image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.12-ruby-2.7.2 needs: [] before_script: [] @@ -475,9 +477,6 @@ image:docs-lint-markdown: - .docker_prepare stage: build-images variables: - ALPINE_VERSION: '3.12' - VALE_VERSION: '2.8.0' - MARKDOWNLINT_VERSION: '0.26.0' IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-markdown:alpine-$ALPINE_VERSION-vale-$VALE_VERSION-markdownlint-$MARKDOWNLINT_VERSION DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint-markdown script: @@ -497,8 +496,6 @@ image:docs-lint-html: - .docker_prepare stage: build-images variables: - RUBY_VERSION: '2.7.2' - ALPINE_VERSION: '3.12' IMAGE_NAME: $CI_REGISTRY_IMAGE/lint-html:alpine-$ALPINE_VERSION-ruby-$RUBY_VERSION DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint-html script: |