Permalink
Browse files

Merge pull request #12107 from kares/master

allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
  • Loading branch information...
2 parents bdd5183 + 0941a10 commit 1428131f647c1448d897d18eeb9656ea4773838f @rafaelfranca rafaelfranca committed Oct 31, 2013
Showing with 13 additions and 5 deletions.
  1. +1 −0 .travis.yml
  2. +12 −5 Gemfile
View
@@ -1,6 +1,7 @@
script: 'ci/travis.rb'
before_install:
- travis_retry gem install bundler
+ - "rvm current | grep 'jruby' && export AR_JDBC=true || echo"
rvm:
- 1.9.3
- 2.0.0
View
17 Gemfile
@@ -63,11 +63,18 @@ end
platforms :jruby do
gem 'json'
- gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
-
- group :db do
- gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
- gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+ if ENV['AR_JDBC']
+ gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ group :db do
+ gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+ end
+ else
+ gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+ group :db do
+ gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
+ gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+ end
end
end

0 comments on commit 1428131

Please sign in to comment.