summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-05-03 00:05:42 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-05-03 00:28:44 +0200
commitf6596f1e792c3679751b3258c51296b437b22a14 (patch)
treedb0c6f4f894f4fd3038fee12bee069ccdeaf2557
parent920d55b9f8afd35e16351fb57d671acf66092e89 (diff)
downloadgitlab-ce-f6596f1e792c3679751b3258c51296b437b22a14.tar.gz
Move api lint out of static analysis job
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-xscripts/static-analysis1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa62a86d31d..0aaed15b27d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,6 +264,7 @@ spinach mysql 9 10: *spinach-knapsack-mysql
static-analysis:
<<: *ruby-static-analysis
<<: *dedicated-runner
+ <<: *except-docs
stage: test
script:
- scripts/static-analysis
@@ -276,6 +277,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]
]