diff --git a/.travis.yml b/.travis.yml index b62d6ce2d8ec6102a2a03f96b6879bd723b311bf..f1ea16d85191486a9543391843cde9dfffbe78cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +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" diff --git a/config/database.yml.mysql b/config/database.yml.mysql new file mode 100644 index 0000000000000000000000000000000000000000..0547d4ac8fa2ec54928a99e8d138259c2a7622d0 --- /dev/null +++ b/config/database.yml.mysql @@ -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