summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-01-27 16:16:03 +0100
committerJames Lopez <james@jameslopez.es>2016-01-27 16:16:03 +0100
commite862af95375ed9e7ff778352c3900946bbb8e7e7 (patch)
tree3b35fa7fbce5d648dc924ab8f0c6d3394ba3b7da /.gitlab-ci.yml
parent683770f35d8ef691d8bcc828aa958b3619081d37 (diff)
downloadgitlab-ce-e862af95375ed9e7ff778352c3900946bbb8e7e7.tar.gz
merge spec and spinach jobs
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml101
1 files changed, 4 insertions, 97 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 414344a7f75..dbdbae9d787 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,116 +137,23 @@ bundler:audit:
# Ruby 2.1 jobs
-spec:feature:ruby21:
+spec:ruby21:
image: ruby:2.1
script:
- RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spec:api:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spec:models:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spec:lib:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spec:services:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spec:benchmark:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test bundle exec rake spec:benchmark
- tags:
- - ruby
- - mysql
- allow_failure: true
- only:
- - master
-
-spec:other:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
tags:
- ruby
- mysql
only:
- master
-spinach:project:half:ruby21:
+spinach:ruby21:
image: ruby:2.1
script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
tags:
- ruby
- mysql
only:
- master
-
-spinach:project:rest:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
- tags:
- - ruby
- - mysql
- only:
- - master
-
-spinach:other:ruby21:
- image: ruby:2.1
- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
- tags:
- - ruby
- - mysql
- only:
- - master
-
-bundler:audit:ruby21:
- image: ruby:2.1
- script:
- - "bundle exec bundle-audit update"
- - "bundle exec bundle-audit check"
- tags:
- - ruby
- - mysql
- allow_failure: true
- only:
- - master