From 43997f2f99f853ce1acc8d662f6d57a69bbef55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 2 May 2017 16:11:47 +0200
Subject: Make the static-analysis job be run for docs branches too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 947a8679093..63e7001283d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -264,7 +264,6 @@ spinach mysql 9 10: *spinach-knapsack-mysql
 static-analysis:
   <<: *ruby-static-analysis
   <<: *dedicated-runner
-  <<: *except-docs
   stage: test
   script:
     - scripts/static-analysis
-- 
cgit v1.2.1


From ccbf9d89b8c1b526789169bd661652774420e90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 2 May 2017 16:12:11 +0200
Subject: DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63e7001283d..ccbc86529d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -268,6 +268,21 @@ static-analysis:
   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:
@@ -299,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
 
 db:migrate:reset pg:
   <<: *db-migrate-reset
   <<: *use-pg
-  <<: *except-docs
 
 db:migrate:reset mysql:
   <<: *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
@@ -322,16 +337,15 @@ db:migrate:reset mysql:
 db:rollback pg:
   <<: *db-rollback
   <<: *use-pg
-  <<: *except-docs
 
 db:rollback mysql:
   <<: *db-rollback
   <<: *use-mysql
-  <<: *except-docs
 
 .db-seed_fu: &db-seed_fu
   stage: test
   <<: *dedicated-runner
+  <<: *except-docs
   variables:
     SIZE: "1"
     SETUP_DB: "false"
@@ -349,12 +363,10 @@ db:rollback mysql:
 db:seed_fu pg:
   <<: *db-seed_fu
   <<: *use-pg
-  <<: *except-docs
 
 db:seed_fu mysql:
   <<: *db-seed_fu
   <<: *use-mysql
-  <<: *except-docs
 
 gitlab:assets:compile:
   stage: test
@@ -395,21 +407,6 @@ 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
-- 
cgit v1.2.1