diff options
author | Rémy Coutable <remy@rymai.me> | 2017-05-03 19:40:44 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 19:40:44 +0300 |
commit | e14ca5394edf0497184415f12629dfdbe72a2727 (patch) | |
tree | 2ef62d87a5ce7307a79c767cc1c885c73f981912 | |
parent | 593b64692c3a63966244b13cefe9154449f73bca (diff) | |
parent | c5bca70d550434001e544824ce182cce68a58677 (diff) |
Merge branch 'docs/move-api-lint-to-docs-link-job' into 'master'
Move api lint out of static analysis job
See merge request !11046
-rw-r--r-- | .gitlab-ci.yml | 7 | ||||
-rwxr-xr-x | scripts/static-analysis | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa62a86d31d..7f665f19132 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,11 +264,15 @@ spinach mysql 9 10: *spinach-knapsack-mysql static-analysis: <<: *ruby-static-analysis <<: *dedicated-runner + <<: *except-docs stage: test script: - scripts/static-analysis -docs:check:links: +# Documentation checks: +# - Check validity of relative links +# - Make sure cURL examples in API docs use the full switches +docs lint: image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine" stage: test <<: *dedicated-runner @@ -276,6 +280,7 @@ docs:check:links: dependencies: [] before_script: [] script: + - scripts/lint-doc.sh - mv doc/ /nanoc/content/ - cd /nanoc # Build HTML from Markdown diff --git a/scripts/static-analysis b/scripts/static-analysis index 192d9d4c3ba..1bd6b339830 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -9,7 +9,6 @@ tasks = [ %w[bundle exec rake scss_lint], %w[bundle exec rake brakeman], %w[bundle exec license_finder], - %w[scripts/lint-doc.sh], %w[yarn run eslint], %w[bundle exec rubocop --require rubocop-rspec] ] |