Skip to content

Commit 1d3deaa

Browse files
comandeo-mongoAlexKovynevAlexKovynev
authored
Rails 8.1 Support (#6054) (#6059)
* Rails 8.1 Support * Re-enable rails master tests --------- Co-authored-by: AlexKovynev <[email protected]> Co-authored-by: AlexKovynev <[email protected]>
1 parent 82536e8 commit 1d3deaa

File tree

7 files changed

+55
-33
lines changed

7 files changed

+55
-33
lines changed

‎.evergreen/config.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,10 @@ axes:
608608
display_name: "Rails 8.0"
609609
variables:
610610
RAILS: "8.0"
611+
- id: "8.1"
612+
display_name: "Rails 8.1"
613+
variables:
614+
RAILS: "8.1"
611615

612616
- id: "test-i18n-fallbacks"
613617
display_name: Test i18n fallbacks
@@ -641,7 +645,7 @@ buildvariants:
641645
matrix_spec:
642646
ruby: ["ruby-3.3"]
643647
driver: ["current"]
644-
topology: '*'
648+
topology: ['replica_set']
645649
mongodb-version: ['latest']
646650
os: ubuntu-22.04
647651
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -769,27 +773,27 @@ buildvariants:
769773
tasks:
770774
- name: "test"
771775

772-
# Skip until Rails 8.1 supported
773-
#- matrix_name: "rails-master"
774-
# matrix_spec:
775-
# ruby: ["ruby-3.2"]
776-
# driver: ["current"]
777-
# mongodb-version: "7.0"
778-
# topology: "server"
779-
# rails: ['master']
780-
# os: ubuntu-22.04
781-
# fle: helper
782-
# display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
783-
# tasks:
784-
# - name: "test"
776+
777+
- matrix_name: "rails-master"
778+
matrix_spec:
779+
ruby: ["ruby-3.2"]
780+
driver: ["current"]
781+
mongodb-version: "7.0"
782+
topology: "server"
783+
rails: ['master']
784+
os: ubuntu-22.04
785+
fle: helper
786+
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
787+
tasks:
788+
- name: "test"
785789

786790
- matrix_name: "rails-8"
787791
matrix_spec:
788792
ruby: ["ruby-3.3"]
789793
driver: ["current"]
790794
mongodb-version: "7.0"
791795
topology: "server"
792-
rails: ['8.0']
796+
rails: ['8.0', '8.1']
793797
os: ubuntu-22.04
794798
fle: helper
795799
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"

‎.evergreen/config/axes.yml.erb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ axes:
208208
display_name: "Rails 8.0"
209209
variables:
210210
RAILS: "8.0"
211+
- id: "8.1"
212+
display_name: "Rails 8.1"
213+
variables:
214+
RAILS: "8.1"
211215

212216
- id: "test-i18n-fallbacks"
213217
display_name: Test i18n fallbacks

‎.evergreen/config/variants.yml.erb‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildvariants:
33
matrix_spec:
44
ruby: ["ruby-3.3"]
55
driver: ["current"]
6-
topology: '*'
6+
topology: ['replica_set']
77
mongodb-version: ['latest']
88
os: ubuntu-22.04
99
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -131,27 +131,27 @@ buildvariants:
131131
tasks:
132132
- name: "test"
133133

134-
# Skip until Rails 8.1 supported
135-
#- matrix_name: "rails-master"
136-
# matrix_spec:
137-
# ruby: ["ruby-3.2"]
138-
# driver: ["current"]
139-
# mongodb-version: "7.0"
140-
# topology: "server"
141-
# rails: ['master']
142-
# os: ubuntu-22.04
143-
# fle: helper
144-
# display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
145-
# tasks:
146-
# - name: "test"
134+
135+
- matrix_name: "rails-master"
136+
matrix_spec:
137+
ruby: ["ruby-3.2"]
138+
driver: ["current"]
139+
mongodb-version: "7.0"
140+
topology: "server"
141+
rails: ['master']
142+
os: ubuntu-22.04
143+
fle: helper
144+
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
145+
tasks:
146+
- name: "test"
147147

148148
- matrix_name: "rails-8"
149149
matrix_spec:
150150
ruby: ["ruby-3.3"]
151151
driver: ["current"]
152152
mongodb-version: "7.0"
153153
topology: "server"
154-
rails: ['8.0']
154+
rails: ['8.0', '8.1']
155155
os: ubuntu-22.04
156156
fle: helper
157157
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
ruby: [ "3.3" ]
2222
mongodb: [ "8.0" ]
23-
rails: [ ~, "8.0" ]
23+
rails: [ ~, "8.1" ]
2424
fle: [ ~, "helper" ]
2525
topology: [ replica_set, sharded_cluster ]
2626

‎gemfiles/rails-8.1.gemfile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# rubocop:todo all
2+
source 'https://rubygems.org'
3+
4+
gem 'actionpack', '~> 8.1.0'
5+
gem 'activemodel', '~> 8.1.0'
6+
7+
group :test do
8+
gem 'activejob', '~> 8.1.0'
9+
end
10+
gemspec path: '..'
11+
12+
require_relative './standard'
13+
14+
standard_dependencies

‎mongoid.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
3131
# Ruby 3.0 requires ActiveModel 6.0 or higher.
3232
# activemodel 7.0.0 cannot be used due to Class#descendants issue
3333
# See: https://github.com/rails/rails/pull/43951
34-
s.add_dependency("activemodel", ['>=5.1', '<8.1', '!= 7.0.0'])
34+
s.add_dependency("activemodel", ['>=5.1', '< 8.2', '!= 7.0.0'])
3535
s.add_dependency("mongo", ['>=2.18.0', '<3.0.0'])
3636
s.add_dependency("concurrent-ruby", ['>= 1.0.5', '< 2.0'])
3737

‎spec/shared‎

0 commit comments

Comments
 (0)