diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | config/database.yml.travis | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1d160831a..30ac8defd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,8 @@ rvm: before_script: - "sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev" - "psql -c 'create database chouette_test;' -U postgres" - - "rake ci:prepare_travis" + - "rake ci:db_travis_config" script: "rake spec" notifications: recipients: - - luc.donnet@dryade.net - - michel.etienne@dryade.net
\ No newline at end of file + - luc.donnet@dryade.net
\ No newline at end of file diff --git a/config/database.yml.travis b/config/database.yml.travis index 27552cbec..797872065 100644 --- a/config/database.yml.travis +++ b/config/database.yml.travis @@ -1,3 +1,9 @@ +development: + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> + database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %> + encoding: utf8 + username: postgres + test: adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> |