diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-31 10:05:02 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-31 10:05:02 -0700 |
| commit | 1428131f647c1448d897d18eeb9656ea4773838f (patch) | |
| tree | 2cadf4cda2d32737e25812c8482892dbaa1fdab6 | |
| parent | bdd518343e3dfaae1dad123db2a55d25773fc278 (diff) | |
| parent | 0941a109fda0a96403fc9b51249ced7b7ca63447 (diff) | |
| download | rails-1428131f647c1448d897d18eeb9656ea4773838f.tar.gz rails-1428131f647c1448d897d18eeb9656ea4773838f.tar.bz2 rails-1428131f647c1448d897d18eeb9656ea4773838f.zip | |
Merge pull request #12107 from kares/master
allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Gemfile | 17 |
2 files changed, 13 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f0e9d570f5..033606f9d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 |