summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-05-02 16:35:56 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-05-02 16:35:56 +0000
commit9fce7c8e02b5486e4931432cad8b07830fa65278 (patch)
tree2eee68c849e72c0b9770c5c32a6dc49a8ea18176 /.gitlab-ci.yml
parent98ae016ab207a7f4e27d151584156af6011d48d5 (diff)
parentccbf9d89b8c1b526789169bd661652774420e90a (diff)
downloadgitlab-ce-9fce7c8e02b5486e4931432cad8b07830fa65278.tar.gz
Merge branch 'docs-mrs-should-run-static-analysis' into 'master'
Docs branches should run static analysis See merge request !11035
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml40
1 files changed, 18 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75e419b4223..aa62a86d31d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,11 +264,25 @@ 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:
+ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
+ stage: test
+ <<: *dedicated-runner
+ cache: {}
+ dependencies: []
+ before_script: []
+ script:
+ - mv doc/ /nanoc/content/
+ - cd /nanoc
+ # Build HTML from Markdown
+ - bundle exec nanoc
+ # Check the internal links
+ - bundle exec nanoc check internal_links
+
downtime_check:
<<: *rake-exec
except:
@@ -300,22 +314,22 @@ ee_compat_check:
.db-migrate-reset: &db-migrate-reset
stage: test
<<: *dedicated-runner
+ <<: *except-docs
script:
- bundle exec rake db:migrate:reset
rake pg db:migrate:reset:
<<: *db-migrate-reset
<<: *use-pg
- <<: *except-docs
rake mysql db:migrate:reset:
<<: *db-migrate-reset
<<: *use-mysql
- <<: *except-docs
.db-rollback: &db-rollback
stage: test
<<: *dedicated-runner
+ <<: *except-docs
script:
- bundle exec rake db:rollback STEP=120
- bundle exec rake db:migrate
@@ -323,16 +337,15 @@ rake mysql db:migrate:reset:
rake pg db:rollback:
<<: *db-rollback
<<: *use-pg
- <<: *except-docs
rake mysql db:rollback:
<<: *db-rollback
<<: *use-mysql
- <<: *except-docs
.db-seed_fu: &db-seed_fu
stage: test
<<: *dedicated-runner
+ <<: *except-docs
variables:
SIZE: "1"
SETUP_DB: "false"
@@ -350,12 +363,10 @@ rake mysql db:rollback:
rake pg db:seed_fu:
<<: *db-seed_fu
<<: *use-pg
- <<: *except-docs
rake mysql db:seed_fu:
<<: *db-seed_fu
<<: *use-mysql
- <<: *except-docs
rake gitlab:assets:compile:
stage: test
@@ -396,21 +407,6 @@ rake karma:
paths:
- coverage-javascript/
-docs:check:links:
- image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
- stage: test
- <<: *dedicated-runner
- cache: {}
- dependencies: []
- before_script: []
- script:
- - mv doc/ /nanoc/content/
- - cd /nanoc
- # Build HTML from Markdown
- - bundle exec nanoc
- # Check the internal links
- - bundle exec nanoc check internal_links
-
bundler:audit:
stage: test
<<: *ruby-static-analysis