Skip to content

Commit 5efd7ab

Browse files
committed
Test against Rails 6.0
Also, moved sqlite3 gem to individual gemfiles because Rails 6 requires sqlite3 upper 1.4.0. Ref: rails/rails#35844
1 parent aefd98d commit 5efd7ab

8 files changed

+20
-1
lines changed

.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gemfile:
88
- Gemfile.rails42
99
- Gemfile.rails50
1010
- Gemfile.rails52
11+
- Gemfile.rails60
1112
- Gemfile.mongo_mapper
1213
rvm:
1314
- 2.2.9
@@ -35,6 +36,12 @@ matrix:
3536
exclude:
3637
- gemfile: Gemfile.mongo_mapper
3738
env: DB=postgresql
39+
- rvm: 2.2.9
40+
gemfile: Gemfile.rails60
41+
- rvm: 2.3.6
42+
gemfile: Gemfile.rails60
43+
- rvm: 2.4.3
44+
gemfile: Gemfile.rails60
3845
branches:
3946
only:
4047
- master

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ gem 'rails', '5.1.4', require: false
55
gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
77
gem 'mongoid'
8+
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]

Gemfile.global

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ gemspec
55
gem 'rake'
66
gem 'rspec', :require => false
77

8-
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]
98
gem 'pg', '~> 0.21.0', :platform => [:ruby, :mswin, :mingw]
109
gem 'sequel'
1110

Gemfile.mongo_mapper

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ gem 'rails', '4.2.8', :require => false
55
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.0', platform: :jruby
77
gem 'mongo_mapper'
8+
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]

Gemfile.rails42

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ gem 'rails', '4.2.8', :require => false
55
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.0', platform: :jruby
77
gem 'mongoid', '~> 5.0'
8+
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]

Gemfile.rails50

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ gem 'rails', '5.0.6', require: false
55
gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0', platform: :jruby
77
gem 'mongoid'
8+
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]

Gemfile.rails52

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ gem 'rails', '~> 5.2.0', require: false
55
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
66
gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
77
gem 'mongoid', github: 'mongodb/mongoid'
8+
gem 'sqlite3', '~> 1.3.6', :platform => [:ruby, :mswin, :mingw]

Gemfile.rails60

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
eval_gemfile('Gemfile.global')
2+
3+
gem 'minitest', '~> 5.8'
4+
gem 'rails', '~> 6.0.0.rc1', require: false
5+
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
6+
gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master', platform: :jruby
7+
gem 'mongoid', github: 'mongodb/mongoid'
8+
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

0 commit comments

Comments
 (0)