[Travis] try run both db

Dmitriy Zaporozhets
1 parent ddc7568f
Showing 2 changed files with 36 additions and 1 deletions Show diff stats
.travis.yml
config/database.yml.mysql
+env:
+  - DB=mysql
+  - DB=sqlite
 before_install: sudo apt-get install libicu-dev -y
 branches:
   only:
@@ -5,7 +8,7 @@ branches:
 rvm:
   - 1.9.2
 before_script:
-  - "cp config/database.yml.sqlite config/database.yml"
+  - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"
   - "bundle exec rake db:create RAILS_ENV=test"
   - "bundle exec rake db:migrate RAILS_ENV=test"
@@ -0,0 +1,32 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: gitlabhq_development
+  pool: 5
+  username: root
+  password: "secure password"
+  # socket: /tmp/mysql.sock
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: gitlabhq_test
+  pool: 5
+  username: root
+  password:
+  # socket: /tmp/mysql.sock
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: gitlabhq_production
+  pool: 5
+  username: root
+  password: "secure password"
+  # socket: /tmp/mysql.sock
	1	+env:
	2	+ - DB=mysql
	3	+ - DB=sqlite
1	4	before_install: sudo apt-get install libicu-dev -y
2	5	branches:
3	6	only:
...	...	@@ -5,7 +8,7 @@ branches:
5	8	rvm:
6	9	- 1.9.2
7	10	before_script:
8		- - "cp config/database.yml.sqlite config/database.yml"
	11	+ - "cp config/database.yml.$DB config/database.yml"
9	12	- "cp config/gitlab.yml.example config/gitlab.yml"
10	13	- "bundle exec rake db:create RAILS_ENV=test"
11	14	- "bundle exec rake db:migrate RAILS_ENV=test"
...	...
...	...	@@ -0,0 +1,32 @@
	1	+development:
	2	+ adapter: mysql2
	3	+ encoding: utf8
	4	+ reconnect: false
	5	+ database: gitlabhq_development
	6	+ pool: 5
	7	+ username: root
	8	+ password: "secure password"
	9	+ # socket: /tmp/mysql.sock
	10	+
	11	+# Warning: The database defined as "test" will be erased and
	12	+# re-generated from your development database when you run "rake".
	13	+# Do not set this db to the same as development or production.
	14	+test:
	15	+ adapter: mysql2
	16	+ encoding: utf8
	17	+ reconnect: false
	18	+ database: gitlabhq_test
	19	+ pool: 5
	20	+ username: root
	21	+ password:
	22	+ # socket: /tmp/mysql.sock
	23	+
	24	+production:
	25	+ adapter: mysql2
	26	+ encoding: utf8
	27	+ reconnect: false
	28	+ database: gitlabhq_production
	29	+ pool: 5
	30	+ username: root
	31	+ password: "secure password"
	32	+ # socket: /tmp/mysql.sock
...	...