diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2c13cf..dc79cc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: - local: $JOB_ROOT_DIR/conventional_commits/.gitlab-ci.yml - local: $JOB_ROOT_DIR/git_push_mirror/.gitlab-ci.yml - local: $JOB_ROOT_DIR/gitlab_release/.gitlab-ci.yml - - local: $JOB_ROOT_DIR/lint/markdown.gitlab-ci.yml + - local: $JOB_ROOT_DIR/lint/markdown.gitlab-ci.yaml - local: $JOB_ROOT_DIR/python/.gitlab-ci.yml - template: Security/Dependency-Scanning.gitlab-ci.yml #- template: Security/License-Scanning.gitlab-ci.yml diff --git a/.markdownlint.json b/.markdownlint.json deleted file mode 100644 index ff5d514..0000000 --- a/.markdownlint.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "line-length": false, - "MD007": { - "indent": 4 - }, - "MD033": { - "allowed_elements": [ "div", "s", "span", "u" ] - } -} diff --git a/lint/markdown.gitlab-ci.yaml b/lint/markdown.gitlab-ci.yaml index bec8249..10d42a7 100644 --- a/lint/markdown.gitlab-ci.yaml +++ b/lint/markdown.gitlab-ci.yaml @@ -40,9 +40,10 @@ .Lint_Markdown_Pages: variables: MDLINT_PATHS: "pages/*.md pages/**/*.md pages/**/**/*.md pages/**/**/**/*.md pages/**/**/**/**/**/*.md #CHANGELOG.md !gitlab-ci !website-template" + MD_LINT_CONFIG-PATH: "$CI_PROJECT_DIR/website-template" extends: .Lint_Markdown rules: - if: '$CI_COMMIT_BRANCH' exists: - - "pages/" + - "pages/index.md" - when: never \ No newline at end of file diff --git a/template/website.gitlab-ci.yaml b/template/website.gitlab-ci.yaml index a8f0d27..20db7db 100644 --- a/template/website.gitlab-ci.yaml +++ b/template/website.gitlab-ci.yaml @@ -4,7 +4,7 @@ include: - local: $JOB_ROOT_DIR/.gitlab-ci_common.yaml - local: $JOB_ROOT_DIR/mkdocs/.gitlab-ci.yml - - local: $JOB_ROOT_DIR/lint/markdown.gitlab-ci.yml + - local: $JOB_ROOT_DIR/lint/markdown.gitlab-ci.yaml Website Page Linting: diff --git a/website-template b/website-template index 969912b..cb55c6b 160000 --- a/website-template +++ b/website-template @@ -1 +1 @@ -Subproject commit 969912bcb75a6c8c74b976f9b5fbed988d6430a5 +Subproject commit cb55c6bdca3c2853996452b89504b7e58129ab6f