diff options
| author | Evan Read <eread@gitlab.com> | 2023-09-20 05:52:58 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2023-09-20 06:24:47 +0300 |
| commit | bfd1c8bd60ebd8e18f3109f37adaa2264dcfdbda (patch) | |
| tree | 8ac86bf4798a16063bfe1bbfeb3b0279b6b49a47 | |
| parent | 89a2dc837bdc79631c907f23adc30d9ead1ad1c3 (diff) | |
Remove requirement to globally install markdownlint-cli2 for EOL testeread/remove-requirement-to-globally-install-markdownlint-cli2-for-eol-test
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | Makefile | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 401cf801..625a8f07 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -249,8 +249,8 @@ test_external_links_operator: # test_EOL_whitespace: extends: - - .rules_chores - - .bundle + - .rules_site_tests + - .bundle_and_yarn stage: test image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.18-ruby-3.2.2-4207821e needs: [] @@ -261,7 +261,6 @@ test_EOL_whitespace: - bundle config set --local path 'vendor/bundle' # Install dependencies into ./vendor/bundle - bundle install - bundle exec rake default - - yarn global add markdownlint-cli2 - make markdownlint-whitespace-tests test_unlinked_images: @@ -202,25 +202,25 @@ markdownlint-tests: markdownlint-whitespace-tests-gitlab: @printf "\n$(INFO)INFO: Running markdownlint whitespace tests on GitLab project...$(END)\n" - @cd ../gitlab/doc && markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" + @cd ../gitlab/doc && npx markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" markdownlint-whitespace-tests-gitlab-runner: @printf "\n$(INFO)INFO: Running markdownlint whitespace tests on GitLab Runner project...$(END)\n" - @cd ../gitlab-runner/docs && markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" + @cd ../gitlab-runner/docs && npx markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" markdownlint-whitespace-tests-omnibus-gitlab: @printf "\n$(INFO)INFO: Running markdownlint whitespace tests on Omnibus GitLab project...$(END)\n" - @cd ../omnibus-gitlab/doc && markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" + @cd ../omnibus-gitlab/doc && npx markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" markdownlint-whitespace-tests-charts-gitlab: @printf "\n$(INFO)INFO: Running markdownlint whitespace tests on GitLab Chart project...$(END)\n" - @cd ../charts-gitlab/doc && markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" + @cd ../charts-gitlab/doc && npx markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" markdownlint-whitespace-tests-gitlab-operator: @printf "\n$(INFO)INFO: Running markdownlint whitespace tests on GitLab Operator project...$(END)\n" - @cd ../gitlab-operator/doc && markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" + @cd ../gitlab-operator/doc && npx markdownlint-cli2-config "../../gitlab-docs/tasks/.markdownlint.yml" "**/*.md" -markdownlint-whitespace-tests: install-nodejs-dependencies +markdownlint-whitespace-tests: @$(MAKE) markdownlint-whitespace-tests-gitlab || true @$(MAKE) markdownlint-whitespace-tests-gitlab-runner || true @$(MAKE) markdownlint-whitespace-tests-omnibus-gitlab || true |