Skip to content

Commit afa4d72

Browse files
Robert Marshalleread
andcommitted
Merge branch 'eread/switch-to-lychee-for-link-checking' into 'master'
Switch to Lychee for link checking See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7547 Merged-by: Robert Marshall <[email protected]> Approved-by: Robert Marshall <[email protected]> Reviewed-by: Evan Read <[email protected]> Co-authored-by: Evan Read <[email protected]>
2 parents c10fe09 + 34e4de4 commit afa4d72

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ruby 3.1.4
2-
vale 3.0.7
2+
vale 3.4.1

doc/settings/memory_constrained_envs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ With some adjustments, GitLab can run comfortably on much lower specifications t
2222
[minimum requirements](https://docs.gitlab.com/ee/install/requirements.html) or the
2323
[reference architectures](https://docs.gitlab.com/ee/administration/reference_architectures/).
2424

25-
The following sections contain advice that will allow GitLab to run in environments
25+
The following sections contain advice that allows GitLab to run in environments
2626
that do not meet the minimum requirements. While most GitLab parts should be
2727
functional with these settings in place, you may experience unexpected degradation
2828
of both product functionality and performance. You should be able to run GitLab
29-
with up to 5 developers with individual Git projects no larger than 100MB.
29+
with up to 5 developers with individual Git projects no larger than 100 MB.
3030

3131
## Minimum requirements for constrained environments
3232

3333
The minimum expected specs with which GitLab can be run are:
3434

3535
- Linux-based system (ideally Debian-based or RedHat-based)
3636
- 4 CPU cores of ARM7/ARM64 or 1 CPU core of AMD64 architecture
37-
- Minimum 2GB of RAM + 1GB of SWAP, optimally 2.5GB of RAM + 1GB of SWAP
38-
- 20GB of available storage
37+
- Minimum 2 GB of RAM + 1 GB of SWAP, optimally 2.5 GB of RAM + 1 GB of swap
38+
- 20 GB of available storage
3939
- A storage with a good random I/O performance with an order of preference:
4040
- [SSD](https://en.wikipedia.org/wiki/Solid-state_drive)
4141
- [eMMC](https://magazine.odroid.com/article/emmc-memory-modules-a-simple-guide/)

gitlab-ci-config/gitlab-com.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,42 +235,46 @@ rubocop:
235235
- if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
236236
needs: []
237237

238-
# Perform documentation linting on Markdown files
239-
docs-lint markdown:
240-
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.19-vale-3.0.7-markdownlint-0.39.0-markdownlint2-0.12.1
238+
# Perform content linting on documentation Markdown files
239+
docs-lint content:
240+
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.19-vale-3.4.1-markdownlint2-0.13.0-lychee-0.14.3
241241
stage: check
242242
cache: {}
243243
needs: []
244244
before_script: []
245245
script:
246246
# Lint prose
247247
- vale --minAlertLevel error doc
248+
rules:
249+
- if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/'
250+
- if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
251+
- if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
252+
253+
# Perform linting on documentation Markdown files
254+
docs-lint markdown:
255+
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.19-vale-3.4.1-markdownlint2-0.13.0-lychee-0.14.3
256+
stage: check
257+
cache: {}
258+
needs: []
259+
before_script: []
260+
script:
248261
# Lint Markdown
249262
- markdownlint-cli2 'doc/**/*.md'
250263
rules:
251264
- if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/'
252265
- if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
253266
- if: '$PIPELINE_TYPE == "DOCS_PIPELINE"'
254267

255-
# Perform link checks on published HTML files
268+
# Perform link checking on documentation Markdown files
256269
docs-lint links:
257-
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.19-ruby-3.2.3-a5032206
270+
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.19-vale-3.4.1-markdownlint2-0.13.0-lychee-0.14.3
258271
stage: check
259272
cache: {}
260273
needs: []
261274
before_script: []
262275
script:
263-
# Put documentation in location expected by nanoc and configured in nanoc.yaml. For more information, see:
264-
# https://gitlab.com/gitlab-org/gitlab-docs/-/blob/eee6c4c03621ff13743828ad74a8f0e8b96dfe7c/nanoc.yaml#L43
265-
- mkdir /tmp/omnibus-gitlab
266-
- mv doc/ /tmp/omnibus-gitlab
267-
- cd /tmp/gitlab-docs
268-
# Build HTML from Markdown
269-
- make compile
270-
# Check the internal links and anchors (in parallel)
271-
# Links from the home page aren't checked because they aren't rendered here. For information, see:
272-
# https://gitlab.com/gitlab-org/gitlab-docs/-/blob/eee6c4c03621ff13743828ad74a8f0e8b96dfe7c/content/index.erb#L6
273-
- "parallel time bundle exec nanoc check ::: internal_links internal_anchors"
276+
# Check Markdown links
277+
- lychee --offline --include-fragments doc/**/*.md
274278
rules:
275279
- if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/'
276280
- if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'

0 commit comments

Comments
 (0)