diff options
| -rw-r--r-- | config/database.yml.ccontrol | 2 | ||||
| -rw-r--r-- | lib/tasks/ci.rake | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol index c1cccd735..1936af0e1 100644 --- a/config/database.yml.ccontrol +++ b/config/database.yml.ccontrol @@ -7,7 +7,7 @@ development: test: adapter: jdbcpostgresql - database: <%= ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> + database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> encoding: utf8 username: chouette password: chouette diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index cfd68a1cf..9b7ab9793 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -1,10 +1,11 @@ namespace :ci do - task :prepare do + task :db_config cp "config/database.yml.ccontrol", "config/database.yml" end + task :prepare => ["ci:db_config", "db:migrate"] task :deploy do cp "chouette2.war", "/var/lib/tomcat6/webapps/" end - task :build => ["db:migrate", "spec", "war", "ci:deploy"] + task :build => ["spec", "war", "ci:deploy"] end |