diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-23 19:06:41 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-23 19:24:25 +0100 |
| commit | 90609411621f1c2774f2a999817b29a8fe2f9646 (patch) | |
| tree | 9524670044ae9c5b450e1cfcbb25743ae1a5d255 /.gitlab-ci.yml | |
| parent | 768475bd78420b6ca023c1322bc13c336d688056 (diff) | |
| download | gitlab-ce-90609411621f1c2774f2a999817b29a8fe2f9646.tar.gz | |
Use the same path of the docs site as in production
This started with
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24339 where a
broken link was introduced, but the lint checker never caught it.
The docs-lint job does the following:
```yaml
script:
- mv doc/ /tmp/gitlab-docs/content/
- cd /tmp/gitlab-docs
# Build HTML from Markdown
- bundle exec nanoc
# Check the internal links
- bundle exec nanoc check internal_links
```
It moves the `doc/` dir inside `content` where Nanoc is expecting the
markdown files to be. It then builds the site and finally checks for
the links. If the built website was deployed to production, that would
be under `docs.gitlab.com/doc`.
The interesting part here is that
`[the logs](/doc/administration/logs.md#productionlog)`
translates to `<a href="/doc/administration/logs.html#productionlog>`,
so, Nanoc correctly sees this as an existing file!
This MR changes the path of the docs content to be equal to
$DOCS_GITLAB_REPO_SUFFIX which is defined as an environment
variable and takes the value of the slug of each project:
'ce', 'ee', 'omnibus', 'runner'.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c5f3f589b9..d19a4002fad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -546,7 +546,7 @@ docs lint: script: - scripts/lint-doc.sh - scripts/lint-changelog-yaml - - mv doc/ /tmp/gitlab-docs/content/ + - mv doc/ /tmp/gitlab-docs/content/$DOCS_GITLAB_REPO_SUFFIX - cd /tmp/gitlab-docs # Build HTML from Markdown - bundle exec nanoc |