Skip to content

Commit b5284ef

Browse files
committed
Fix Ruby 3.1 on CI for dependent builds
Follow-up to #2553 I've quite missed the fact that dependent builds specify no `RAILS_VERSION`, and another `case` branch was used, causing `net-` dependency failures.
1 parent cef194e commit b5284ef

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Gemfile-rails-dependencies

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ else
2525
gem "puma"
2626
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
2727
gem 'selenium-webdriver', require: false
28+
end
2829

29-
# This is required for Ruby 3.1 and Rails 6.1.x as of time
30-
# of writing, because in Ruby 3.1 these gems are no longer
31-
# automatically included. This issue was fixed on the Rails
32-
# side in Rails 7.0.1, but is not yet fixed in the Rails 6.1.x
33-
# branch. Discussion can be found here - https://github.com/mikel/mail/pull/1439
34-
if RUBY_VERSION >= '3.1' && version.split(' ').last < '7.0'
35-
gem 'net-smtp', require: false
36-
gem 'net-imap', require: false
37-
gem 'net-pop', require: false
38-
end
30+
# This is required for Ruby 3.1 and Rails prior to 7.0.1 as of time
31+
# of writing, because in Ruby 3.1 these gems are no longer
32+
# automatically included. This issue was fixed on the Rails
33+
# side in Rails 7.0.1, but is not yet fixed in the Rails 6.1.x
34+
# branch. Discussion can be found here - https://github.com/mikel/mail/pull/1439
35+
if RUBY_VERSION >= '3.1'
36+
gem 'net-smtp', require: false
37+
gem 'net-imap', require: false
38+
gem 'net-pop', require: false
3939
end

0 commit comments

Comments
 (0)