diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-25 16:38:23 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-25 16:38:23 +0300 |
| commit | 8ceb94081ac516ccaed43f0f4841725a4f9fe2db (patch) | |
| tree | 3f7eb88e236ca97ed0ee7c87a1db611e752b6667 | |
| parent | ddc7568fec59aa7a068116f692804504d9aa1a1d (diff) | |
| download | gitlab-ce-8ceb94081ac516ccaed43f0f4841725a4f9fe2db.tar.gz | |
[Travis] try run both db
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | config/database.yml.mysql | 32 |
2 files changed, 36 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b62d6ce2d8e..f1ea16d8519 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 00000000000..0547d4ac8fa --- /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 |