diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | config/database.yml.travis | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c86c8333f..a81440cf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ language: ruby rvm: - 1.8.7 - - jruby-18mode before_install: - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev before_script: - "psql -c 'create database chouette_test;' -U postgres" + - "psql -c 'create database chouette_production_test;' -U postgres" + - "psql -c 'create database jdbc_chouette_test;' -U postgres" + - "psql -c 'create database jdbc_chouette_production_test;' -U postgres" - rake ci:prepare_travis script: "rake spec" branches: diff --git a/config/database.yml.travis b/config/database.yml.travis index 797872065..6163c9a89 100644 --- a/config/database.yml.travis +++ b/config/database.yml.travis @@ -1,6 +1,6 @@ development: adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> - database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %> + database: <%= RUBY_PLATFORM == "java" ? "jdbc" : "" + (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %> encoding: utf8 username: postgres |