summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-27 09:15:16 +0000
committerEvan Read <eread@gitlab.com>2019-08-27 09:15:16 +0000
commit0839fb0c2f6dd6da76a4b4dbdee7c96e3fb2efe1 (patch)
tree727f68174a820fca1fb4bab1968d9bf7aa105a10
parenta390f5ff052cfb9d214acbf1f4e78a830ba0e67b (diff)
parent31c7bf16aa9adef361818d7cdfd4c7141556b433 (diff)
downloadgitlab-ce-0839fb0c2f6dd6da76a4b4dbdee7c96e3fb2efe1.tar.gz
Merge branch 'docs/markdownlint-before-nanoc' into 'master'
Run markdownlint before Nanoc checks See merge request gitlab-org/gitlab-ce!32256
-rw-r--r--.gitlab/ci/docs.gitlab-ci.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 1fad731543c..e77c773824f 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -73,10 +73,11 @@ docs lint:
dependencies: []
script:
- scripts/lint-doc.sh
+ # Lint Markdown
+ - markdownlint --config .markdownlint.json doc/**/*.md
+ # Prepare docs for build
- mv doc/ /tmp/gitlab-docs/content/$DOCS_GITLAB_REPO_SUFFIX
- cd /tmp/gitlab-docs
- # Lint Markdown
- - markdownlint --config $CI_PROJECT_DIR/.markdownlint.json content/$DOCS_GITLAB_REPO_SUFFIX/**/*.md
# Build HTML from Markdown
- bundle exec nanoc
# Check the internal links