Skip to content

Commit 0b3c744

Browse files
Get Ruby 3.1 in CI
1 parent 3e7d8d0 commit 0b3c744

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.github/workflows/ci.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ jobs:
1717
matrix:
1818
include:
1919
# Edge Rails (7.1) builds >= 2.7
20+
- ruby: '3.1'
21+
allow_failure: true
22+
env:
23+
RAILS_VERSION: 'main'
2024
- ruby: '3.0'
2125
allow_failure: true
2226
env:
@@ -28,19 +32,19 @@ jobs:
2832

2933
# Rails 7.0 builds >= 2.7
3034
- ruby: 3.1
31-
allow_failure: true
3235
env:
3336
RAILS_VERSION: '~> 7.0.0'
3437
- ruby: '3.0'
35-
allow_failure: true
3638
env:
3739
RAILS_VERSION: '~> 7.0.0'
3840
- ruby: 2.7
39-
allow_failure: true
4041
env:
4142
RAILS_VERSION: '~> 7.0.0'
4243

4344
# Rails 6.1 builds >= 2.5
45+
- ruby: '3.1'
46+
env:
47+
RAILS_VERSION: '~> 6.1.0'
4448
- ruby: '3.0'
4549
env:
4650
RAILS_VERSION: '~> 6.1.0'

Gemfile-rails-dependencies

+11
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,15 @@ else
2525
gem "puma"
2626
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
2727
gem 'selenium-webdriver', require: false
28+
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
2839
end

0 commit comments

Comments
 (0)