X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=.travis.yml;h=75b4c5c7030cd08ad09b6fa3570ddc23e7ae88ed;hb=d1d138562a347ec78f0331d5242e28fbb368bad0;hp=6d39488df2774ef7d3f001bc9dbd3437cc73351e;hpb=bda7fe38d0b0e39a408c4eb44374a330c24c3a49;p=wvm%2Fgitlab.git

diff --git a/.travis.yml b/.travis.yml
index 6d39488df..75b4c5c70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,27 @@
 language: ruby
 env:
-  - DB=postgresql
-  - DB=mysql
+  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"
 branches:
   only:
     - 'master'
 rvm:
-  - 1.9.3-p327
+  - 2.0.0
 services:
   - mysql
-  - postgresql
+  - redis-server
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
-  - "bundle exec rake db:setup RAILS_ENV=test"
-  - "bundle exec rake db:seed_fu RAILS_ENV=test"
-  - "sh -e /etc/init.d/xvfb start"
-script: "bundle exec rake travis --trace"
+  - "bundle exec rake db:setup"
+  - "bundle exec rake db:seed_fu"
+script: "bundle exec rake $TASK --trace"
+notifications:
+  email: false