Skip to content

Commit d8e0809

Browse files
committed
Update build matrix
1 parent f78b314 commit d8e0809

File tree

7 files changed

+86
-19
lines changed

7 files changed

+86
-19
lines changed

.github/workflows/test.yml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
ruby:
12-
- "3.0"
13-
- "3.1"
1412
- "3.2"
1513
- "3.3"
16-
gemfile: [gemfiles/rails_7.1.gemfile]
14+
- "3.4"
15+
gemfile: [gemfiles/rails_8.0.gemfile]
1716
orm: [active_record]
1817
adapter: [sqlite3]
1918
asset: [webpack]
@@ -33,32 +32,37 @@ jobs:
3332
orm: active_record
3433
adapter: sqlite3
3534
asset: webpacker
36-
- ruby: "3.2"
35+
- ruby: "3.0"
3736
gemfile: gemfiles/rails_7.0.gemfile
3837
orm: active_record
3938
adapter: sqlite3
4039
asset: sprockets
41-
- ruby: "3.2"
40+
- ruby: "3.1"
4241
gemfile: gemfiles/rails_7.1.gemfile
4342
orm: active_record
43+
adapter: sqlite3
44+
asset: sprockets
45+
- ruby: "3.2"
46+
gemfile: gemfiles/rails_7.2.gemfile
47+
orm: active_record
48+
adapter: sqlite3
49+
asset: sprockets
50+
- ruby: "3.4"
51+
gemfile: gemfiles/rails_8.0.gemfile
52+
orm: active_record
4453
adapter: mysql2
4554
asset: importmap
46-
- ruby: "3.2"
47-
gemfile: gemfiles/rails_7.1.gemfile
55+
- ruby: "3.4"
56+
gemfile: gemfiles/rails_8.0.gemfile
4857
orm: active_record
4958
adapter: postgresql
5059
asset: sprockets
51-
- ruby: "3.2"
52-
gemfile: gemfiles/rails_7.1.gemfile
60+
- ruby: "3.4"
61+
gemfile: gemfiles/rails_8.0.gemfile
5362
orm: active_record
5463
adapter: sqlite3
5564
asset: vite
56-
- ruby: "3.3"
57-
gemfile: gemfiles/rails_7.2.gemfile
58-
orm: active_record
59-
adapter: sqlite3
60-
asset: sprockets
61-
- ruby: "3.3"
65+
- ruby: "3.4"
6266
gemfile: gemfiles/rails_8.0.gemfile
6367
orm: active_record
6468
adapter: sqlite3
@@ -88,13 +92,23 @@ jobs:
8892
orm: mongoid
8993
adapter: sqlite3
9094
asset: sprockets
95+
- ruby: "3.3"
96+
gemfile: gemfiles/rails_7.2.gemfile
97+
orm: mongoid
98+
adapter: sqlite3
99+
asset: sprockets
100+
- ruby: "3.4"
101+
gemfile: gemfiles/rails_8.0.gemfile
102+
orm: mongoid
103+
adapter: sqlite3
104+
asset: sprockets
91105
- ruby: jruby-9.4
92-
gemfile: gemfiles/rails_7.0.gemfile
106+
gemfile: gemfiles/rails_7.1.gemfile
93107
orm: active_record
94108
adapter: mysql2
95109
asset: sprockets
96110
- ruby: jruby-9.4
97-
gemfile: gemfiles/rails_7.0.gemfile
111+
gemfile: gemfiles/rails_7.1.gemfile
98112
orm: mongoid
99113
adapter: sqlite3
100114
asset: sprockets

Appraisals

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ appraise 'rails-7.1' do
9090
platforms :ruby, :mswin, :mingw, :x64_mingw do
9191
gem 'sqlite3', '~> 1.3'
9292
end
93+
94+
platforms :jruby do
95+
gem 'activerecord-jdbcmysql-adapter', '~> 71.0'
96+
gem 'activerecord-jdbcpostgresql-adapter', '~> 71.0'
97+
gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0'
98+
end
9399
end
94100

95101
group :mongoid do
@@ -106,11 +112,31 @@ end
106112
appraise 'rails-7.2' do
107113
gem 'rails', '~> 7.2.0'
108114
gem 'importmap-rails', require: false
115+
116+
group :mongoid do
117+
gem 'cancancan-mongoid'
118+
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
119+
gem 'database_cleaner-mongoid', '>= 2.0', require: false
120+
gem 'kaminari-mongoid'
121+
gem 'mongoid', '~> 8.0'
122+
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
123+
gem 'shrine-mongoid', '~> 1.0'
124+
end
109125
end
110126

111127
appraise 'rails-8.0' do
112128
gem 'rails', '~> 8.0.0'
113129
gem 'importmap-rails', require: false
130+
131+
group :mongoid do
132+
gem 'cancancan-mongoid'
133+
gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
134+
gem 'database_cleaner-mongoid', '>= 2.0', require: false
135+
gem 'kaminari-mongoid'
136+
gem 'mongoid', '~> 9.0'
137+
gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
138+
gem 'shrine-mongoid', '~> 1.0'
139+
end
114140
end
115141

116142
appraise 'composite_primary_keys' do

gemfiles/rails_7.1.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ group :active_record do
5050
gem "pg", ">= 1.0.0"
5151
gem "sqlite3", "~> 1.3"
5252
end
53+
54+
platforms :jruby do
55+
gem "activerecord-jdbcmysql-adapter", "~> 71.0"
56+
gem "activerecord-jdbcpostgresql-adapter", "~> 71.0"
57+
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0"
58+
end
5359
end
5460

5561
group :mongoid do

gemfiles/rails_7.2.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,14 @@ group :active_record do
5252
end
5353
end
5454

55+
group :mongoid do
56+
gem "cancancan-mongoid"
57+
gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
58+
gem "database_cleaner-mongoid", ">= 2.0", require: false
59+
gem "kaminari-mongoid"
60+
gem "mongoid", "~> 8.0"
61+
gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
62+
gem "shrine-mongoid", "~> 1.0"
63+
end
64+
5565
gemspec path: "../"

gemfiles/rails_8.0.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,14 @@ group :active_record do
5252
end
5353
end
5454

55+
group :mongoid do
56+
gem "cancancan-mongoid"
57+
gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
58+
gem "database_cleaner-mongoid", ">= 2.0", require: false
59+
gem "kaminari-mongoid"
60+
gem "mongoid", "~> 9.0"
61+
gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
62+
gem "shrine-mongoid", "~> 1.0"
63+
end
64+
5565
gemspec path: "../"

spec/rails_admin/config/has_fields_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
end
2727
end
2828
expect { RailsAdmin.config(Team).fields.detect { |f| f.name == :division } }.not_to raise_error
29-
expect { RailsAdmin.config(Team).fields.detect { |f| f.name == :division }.visible? }.to raise_error(/undefined method `\[\]' for nil/)
29+
expect { RailsAdmin.config(Team).fields.detect { |f| f.name == :division }.visible? }.to raise_error(/undefined method [`']\[\]' for nil/)
3030
end
3131

3232
it 'assigns properties to new one on overriding existing field' do

spec/spec_helper.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
require 'capybara/cuprite'
4949
Capybara.javascript_driver = :cuprite
5050
Capybara.register_driver(:cuprite) do |app|
51-
Capybara::Cuprite::Driver.new(app, js_errors: true, logger: ConsoleLogger)
51+
# Refs. https://github.com/rubycdp/ferrum/issues/470
52+
Capybara::Cuprite::Driver.new(app, flatten: RUBY_ENGINE != 'jruby', js_errors: true, logger: ConsoleLogger)
5253
end
5354
Capybara.server = :webrick
5455

0 commit comments

Comments
 (0)