Skip to content

Commit

Permalink
Work around broken testrb in JRuby 1.6.7, use right adapters on Travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
oggy committed Jun 26, 2012
1 parent fd947de commit f900c13
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 8 deletions.
41 changes: 38 additions & 3 deletions .travis.yml
Expand Up @@ -4,7 +4,42 @@ script: bundle exec rake ci
rvm:
- 1.9.2
- 1.9.3
- jruby-19mode
- jruby-head # jruby-1.6.7 has a broken testrb - use head for now
- rbx-19mode
- ruby-head
- jruby-head
env:
- DB_NAZI_ADAPTER=sqlite3
- DB_NAZI_ADAPTER=mysql
- DB_NAZI_ADAPTER=mysql2
- DB_NAZI_ADAPTER=jdbcmysql
- DB_NAZI_ADAPTER=postgresql
matrix:
include:
- rvm: 1.9.2
env: DB_NAZI_ADAPTER=sqlite3
- rvm: 1.9.2
env: DB_NAZI_ADAPTER=mysql
- rvm: 1.9.2
env: DB_NAZI_ADAPTER=mysql2
- rvm: 1.9.2
env: DB_NAZI_ADAPTER=postgresql

- rvm: 1.9.3
env: DB_NAZI_ADAPTER=sqlite3
- rvm: 1.9.3
env: DB_NAZI_ADAPTER=mysql
- rvm: 1.9.3
env: DB_NAZI_ADAPTER=mysql2
- rvm: 1.9.3
env: DB_NAZI_ADAPTER=postgresql

- rvm: rbx-19mode
env: DB_NAZI_ADAPTER=sqlite3
- rvm: rbx-19mode
env: DB_NAZI_ADAPTER=mysql
- rvm: rbx-19mode
env: DB_NAZI_ADAPTER=mysql2
- rvm: rbx-19mode
env: DB_NAZI_ADAPTER=postgresql

- rvm: jruby-19mode
env: DB_NAZI_ADAPTER=jdbcmysql
14 changes: 11 additions & 3 deletions Gemfile
@@ -1,7 +1,15 @@
source :rubygems
gemspec

group :dev do
gem 'looksee'
gem 'debugger'
case ENV['DB_NAZI_ADAPTER']
when 'mysql'
gem 'mysql'
when 'jdbcmysql'
gem 'activerecord-jdbcmysql-adapter'
when 'mysql2'
gem 'mysql2'
when 'postgresql'
gem 'pg'
else
gem 'sqlite3'
end
4 changes: 2 additions & 2 deletions Rakefile
@@ -1,6 +1,6 @@
require 'ritual'

task :ci do
sh 'bundle exec testrb test/unit'
sh 'bundle exec testrb test/integration'
sh 'testrb test/unit'
sh 'testrb test/integration'
end

0 comments on commit f900c13

Please sign in to comment.