diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 21:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 21:07:43 +0300 |
| commit | 6f0f893bd87535b61e0ecb1ce069eaa7fcb9e5be (patch) | |
| tree | 8af92b29c838e9af2fd70f9a4a2314a08f4af922 /.gitlab | |
| parent | 8b1228b0d409d7751f01d9fb72ebfbbf62399486 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/yaml.gitlab-ci.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/ci/yaml.gitlab-ci.yml b/.gitlab/ci/yaml.gitlab-ci.yml index 323f94b6d04..4fcf940974b 100644 --- a/.gitlab/ci/yaml.gitlab-ci.yml +++ b/.gitlab/ci/yaml.gitlab-ci.yml @@ -10,5 +10,8 @@ lint-ci-gitlab: - "**/*.yml" image: sdesbure/yamllint:latest dependencies: [] + variables: + LINT_PATHS: .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates changelogs script: - - yamllint .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates changelogs + - '[[ ! -d "ee/" ]] || export LINT_PATHS="$LINT_PATHS ee/changelogs"' + - yamllint $LINT_PATHS |