summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAndrew Kumanyaev <me@zzet.org>2013-11-02 16:53:33 +0300
committerAndrew Kumanyaev <me@zzet.org>2013-11-02 16:53:33 +0300
commit4637dc896c1eef960d99751d518b83cf9c9f45ec (patch)
treede4f0da4437fc7ee99c17d135b2e4b905d8f5297 /.travis.yml
parent4c47a89fa5db6ccfcc9ae21fbfd7bb94b427b313 (diff)
downloadgitlab-ce-4637dc896c1eef960d99751d518b83cf9c9f45ec.tar.gz
Run tests in parallel on travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index f0fc2fb8829..c137aec907c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,12 @@
language: ruby
env:
- - DB=mysql TRAVIS=true
+ global:
+ - DB=mysql
+ - TRAVIS=true
+ matrix:
+ - TASK=spinach
+ - TASK=spec
+ - TASK=jasmine:ci
before_install:
- sudo apt-get install libicu-dev -y
- gem install charlock_holmes -v="0.6.9"
@@ -11,8 +17,9 @@ rvm:
- 2.0.0
services:
- mysql
- - postgresql
before_script:
- "cp config/database.yml.$DB config/database.yml"
- "cp config/gitlab.yml.example config/gitlab.yml"
-script: "bundle exec rake gitlab:test --trace"
+ - "bundle exec rake db:setup"
+ - "bundle exec rake db:seed_fu"
+script: "bundle exec rake $TASK --trace"