Merge pull request #5519 from zzet/patch-3

Run tests in parallel on travis

Merge pull request #5519 from zzet/patch-3
Run tests in parallel on travis
Dmitriy Zaporozhets
2 parents 8e006c64 4637dc89
Showing 1 changed file with 10 additions and 3 deletions Show diff stats
.travis.yml
 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"
1	1	language: ruby
2	2	env:
3		- - DB=mysql TRAVIS=true
	3	+ global:
	4	+ - DB=mysql
	5	+ - TRAVIS=true
	6	+ matrix:
	7	+ - TASK=spinach
	8	+ - TASK=spec
	9	+ - TASK=jasmine:ci
4	10	before_install:
5	11	- sudo apt-get install libicu-dev -y
6	12	- gem install charlock_holmes -v="0.6.9"
...	...	@@ -11,8 +17,9 @@ rvm:
11	17	- 2.0.0
12	18	services:
13	19	- mysql
14		- - postgresql
15	20	before_script:
16	21	- "cp config/database.yml.$DB config/database.yml"
17	22	- "cp config/gitlab.yml.example config/gitlab.yml"
18		-script: "bundle exec rake gitlab:test --trace"
	23	+ - "bundle exec rake db:setup"
	24	+ - "bundle exec rake db:seed_fu"
	25	+script: "bundle exec rake $TASK --trace"
...	...