Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,10 @@ axes:
display_name: "Rails 8.0"
variables:
RAILS: "8.0"
- id: "8.1"
display_name: "Rails 8.1"
variables:
RAILS: "8.1"

- id: "test-i18n-fallbacks"
display_name: Test i18n fallbacks
Expand Down Expand Up @@ -641,7 +645,7 @@ buildvariants:
matrix_spec:
ruby: ["ruby-3.3"]
driver: ["current"]
topology: '*'
topology: ['replica_set']
mongodb-version: ['latest']
os: ubuntu-22.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
Expand Down Expand Up @@ -769,27 +773,27 @@ buildvariants:
tasks:
- name: "test"

# Skip until Rails 8.1 supported
#- matrix_name: "rails-master"
# matrix_spec:
# ruby: ["ruby-3.2"]
# driver: ["current"]
# mongodb-version: "7.0"
# topology: "server"
# rails: ['master']
# os: ubuntu-22.04
# fle: helper
# display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
# tasks:
# - name: "test"

- matrix_name: "rails-master"
matrix_spec:
ruby: ["ruby-3.2"]
driver: ["current"]
mongodb-version: "7.0"
topology: "server"
rails: ['master']
os: ubuntu-22.04
fle: helper
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
tasks:
- name: "test"

- matrix_name: "rails-8"
matrix_spec:
ruby: ["ruby-3.3"]
driver: ["current"]
mongodb-version: "7.0"
topology: "server"
rails: ['8.0']
rails: ['8.0', '8.1']
os: ubuntu-22.04
fle: helper
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
Expand Down
4 changes: 4 additions & 0 deletions .evergreen/config/axes.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ axes:
display_name: "Rails 8.0"
variables:
RAILS: "8.0"
- id: "8.1"
display_name: "Rails 8.1"
variables:
RAILS: "8.1"

- id: "test-i18n-fallbacks"
display_name: Test i18n fallbacks
Expand Down
30 changes: 15 additions & 15 deletions .evergreen/config/variants.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildvariants:
matrix_spec:
ruby: ["ruby-3.3"]
driver: ["current"]
topology: '*'
topology: ['replica_set']
mongodb-version: ['latest']
os: ubuntu-22.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
Expand Down Expand Up @@ -131,27 +131,27 @@ buildvariants:
tasks:
- name: "test"

# Skip until Rails 8.1 supported
#- matrix_name: "rails-master"
# matrix_spec:
# ruby: ["ruby-3.2"]
# driver: ["current"]
# mongodb-version: "7.0"
# topology: "server"
# rails: ['master']
# os: ubuntu-22.04
# fle: helper
# display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
# tasks:
# - name: "test"

- matrix_name: "rails-master"
matrix_spec:
ruby: ["ruby-3.2"]
driver: ["current"]
mongodb-version: "7.0"
topology: "server"
rails: ['master']
os: ubuntu-22.04
fle: helper
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
tasks:
- name: "test"

- matrix_name: "rails-8"
matrix_spec:
ruby: ["ruby-3.3"]
driver: ["current"]
mongodb-version: "7.0"
topology: "server"
rails: ['8.0']
rails: ['8.0', '8.1']
os: ubuntu-22.04
fle: helper
display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
ruby: [ "3.3" ]
mongodb: [ "8.0" ]
rails: [ ~, "8.0" ]
rails: [ ~, "8.1" ]
fle: [ ~, "helper" ]
topology: [ replica_set, sharded_cluster ]

Expand Down
14 changes: 14 additions & 0 deletions gemfiles/rails-8.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# rubocop:todo all
source 'https://rubygems.org'

gem 'actionpack', '~> 8.1.0'
gem 'activemodel', '~> 8.1.0'

group :test do
gem 'activejob', '~> 8.1.0'
end
gemspec path: '..'

require_relative './standard'

standard_dependencies
2 changes: 1 addition & 1 deletion mongoid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |s|
# Ruby 3.0 requires ActiveModel 6.0 or higher.
# activemodel 7.0.0 cannot be used due to Class#descendants issue
# See: https://github.com/rails/rails/pull/43951
s.add_dependency("activemodel", ['>=5.1', '<8.1', '!= 7.0.0'])
s.add_dependency("activemodel", ['>=5.1', '< 8.2', '!= 7.0.0'])
s.add_dependency("mongo", ['>=2.18.0', '<3.0.0'])
s.add_dependency("concurrent-ruby", ['>= 1.0.5', '< 2.0'])

Expand Down
2 changes: 1 addition & 1 deletion spec/shared