summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-23 07:48:31 +0000
committerazul <azul@riseup.net>2017-03-23 07:48:31 +0000
commit2989f4142576de191b16832b53c3d1e70701d286 (patch)
treea1547c3bd7e1189eb642d0d8719867cd26c0c2a5
parent7e266166914d29c32ad6c73852e5e07916e6ecf2 (diff)
parent7bf9dae4c5cbc2538f8ef66b0e8a7be5ef16b818 (diff)
Merge branch 'test/ruby-2.3' into 'master'
test: also test ruby 2.3 Closes #21 See merge request !25
-rw-r--r--.gitlab-ci.yml22
1 files changed, 9 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 232ebcb..a8efd0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,13 @@
-# This file is a template, and might need editing before it works on your project.
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/ruby/tags/
-image: "ruby:2.1"
+ruby2-1:
+ image: "ruby:2.1"
+ script:
+ - bundle exec rake test
+
+ruby2-3:
+ image: "ruby:2.3"
+ script:
+ - bundle exec rake test
-# Pick zero or more services to be used on all builds.
-# Only needed when using a docker container to run your tests in.
-# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
services:
- couchdb:1.6.1
@@ -15,8 +17,6 @@ cache:
paths:
- vendor/ruby
-# This is a basic example for a gem or script which doesn't use
-# services such as redis or postgres
before_script:
- ruby -v
- curl -s couchdb:5984
@@ -27,7 +27,3 @@ before_script:
- bundle install -j $(nproc) --path vendor --without development debug
- bundle exec rake RAILS_ENV=test db:rotate
- bundle exec rake RAILS_ENV=test db:migrate
-
-rails:
- script:
- - bundle exec rake test