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
107 changes: 62 additions & 45 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,10 @@ axes:
display_name: "MongoDB Latest"
variables:
MONGODB_VERSION: "latest"
- id: "8.2"
display_name: "MongoDB 8.2"
variables:
MONGODB_VERSION: "8.2"
- id: "8.0"
display_name: "MongoDB 8.0"
variables:
Expand Down Expand Up @@ -506,10 +510,18 @@ axes:
display_name: ruby-3.3
variables:
RVM_RUBY: "ruby-3.3"
- id: "ruby-head"
display_name: ruby-head
- id: "ruby-3.4"
display_name: ruby-3.4
variables:
RVM_RUBY: "ruby-3.4"
- id: "ruby-4.0"
display_name: ruby-4.0
variables:
RVM_RUBY: "ruby-4.0"
- id: "ruby-dev"
display_name: ruby-dev
variables:
RVM_RUBY: "ruby-head"
RVM_RUBY: "ruby-dev"

- id: "jruby"
display_name: JRuby Version
Expand All @@ -518,10 +530,17 @@ axes:
display_name: jruby-9.4
variables:
RVM_RUBY: "jruby-9.4"
- id: "jruby-10.0"
display_name: jruby-10.0
variables:
RVM_RUBY: "jruby-10.0"

- id: "os"
display_name: OS
values:
- id: ubuntu-24.04
display_name: "Ubuntu 24.04"
run_on: ubuntu2404-small
- id: ubuntu-22.04
display_name: "Ubuntu 22.04"
run_on: ubuntu2204-small
Expand Down Expand Up @@ -643,7 +662,7 @@ axes:
buildvariants:
- matrix_name: "mongodb-latest"
matrix_spec:
ruby: ["ruby-3.3"]
ruby: [ "ruby-3.3" ]
driver: ["current"]
topology: ['replica_set']
mongodb-version: ['latest']
Expand All @@ -652,23 +671,23 @@ buildvariants:
tasks:
- name: "test"

- matrix_name: "ruby-3.2 + db-7.0"
- matrix_name: recent_mdbs
matrix_spec:
ruby: ["ruby-3.2"]
ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3"]
driver: ["current"]
topology: ['server', 'replica_set', 'sharded_cluster']
mongodb-version: ['7.0']
topology: '*'
mongodb-version: ["8.2", "8.0", "7.0"]
os: ubuntu-22.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"

- matrix_name: "ruby-3.2 + db-6.0"
- matrix_name: "ruby-3.2"
matrix_spec:
ruby: ["ruby-3.2"]
driver: ["current"]
topology: ['server', 'replica_set', 'sharded_cluster']
mongodb-version: ['6.0']
mongodb-version: ['7.0']
os: ubuntu-22.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
Expand Down Expand Up @@ -698,11 +717,11 @@ buildvariants:

- matrix_name: "jruby"
matrix_spec:
jruby: ["jruby-9.4"]
jruby: ["jruby-10.0", "jruby-9.4"]
driver: ["current"]
topology: ['replica_set', 'sharded_cluster']
mongodb-version: '7.0'
os: ubuntu-22.04
mongodb-version: '8.0'
os: ubuntu-24.04
display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -718,13 +737,24 @@ buildvariants:
tasks:
- name: "test"

- matrix_name: "ruby-dev"
matrix_spec:
ruby: ["ruby-dev"]
driver: ["current"]
topology: [ 'replica_set' ]
mongodb-version: "8.2"
os: ubuntu-24.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"

- matrix_name: "driver-upcoming"
matrix_spec:
driver: [master, stable]
ruby: ["ruby-3.3"]
mongodb-version: "6.0"
ruby: ["ruby-4.0"]
mongodb-version: "8.2"
topology: ['replica_set', 'sharded_cluster']
os: ubuntu-22.04
os: ubuntu-24.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand Down Expand Up @@ -765,33 +795,33 @@ buildvariants:
- matrix_name: "bson-master"
matrix_spec:
driver: [bson-master]
ruby: ["ruby-3.3"]
mongodb-version: "7.0"
ruby: ["ruby-4.0"]
mongodb-version: "8.2"
topology: "server"
os: ubuntu-22.04
os: ubuntu-24.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"


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

- matrix_name: "rails-8"
matrix_spec:
ruby: ["ruby-3.3"]
ruby: ["ruby-3.4"]
driver: ["current"]
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: "server"
rails: ['8.0', '8.1']
os: ubuntu-22.04
Expand Down Expand Up @@ -839,9 +869,9 @@ buildvariants:

- matrix_name: app-tests-rails-8
matrix_spec:
ruby: ["ruby-3.2", "ruby-3.3"]
ruby: ["ruby-4.0", "ruby-3.4"]
driver: ["current"]
mongodb-version: '7.0'
mongodb-version: "8.2"
topology: server
app-tests: yes
rails: ['8.0']
Expand All @@ -852,9 +882,9 @@ buildvariants:

- matrix_name: app-tests-rails-7
matrix_spec:
ruby: ["ruby-3.2", "ruby-3.3"]
ruby: ["ruby-3.4", "ruby-3.3"]
driver: ["current"]
mongodb-version: '7.0'
mongodb-version: '8.0'
topology: server
app-tests: yes
rails: ['7.0', '7.1', '7.2']
Expand All @@ -863,19 +893,6 @@ buildvariants:
tasks:
- name: "test"

- matrix_name: app-tests-rails-6
matrix_spec:
ruby: ["ruby-2.7"]
driver: ["current"]
mongodb-version: '5.0'
topology: server
app-tests: yes
rails: ['6.0', '6.1']
os: ubuntu-20.04
display_name: "app tests ${driver}, ${ruby}, ${rails}"
tasks:
- name: "test"

# https://github.com/rails/rails/issues/49737
#- matrix_name: app-tests-jruby-9-4
# matrix_spec:
Expand All @@ -892,11 +909,11 @@ buildvariants:

- matrix_name: "auto-encryption"
matrix_spec:
ruby: ruby-3.1
ruby: ruby-3.4
driver: current
topology: replica_set
mongodb-version: ['6.0']
os: ubuntu-22.04
mongodb-version: "8.2"
os: ubuntu-24.04
rails: ['7.0']
fle: helper
display_name: "FLE: ${rails}, ${driver}, ${mongodb-version}"
Expand All @@ -905,7 +922,7 @@ buildvariants:

- matrix_name: atlas-full
matrix_spec:
ruby: ruby-3.2
ruby: ruby-3.4
os: ubuntu-22.04
auth: auth
ssl: yes
Expand Down
25 changes: 22 additions & 3 deletions .evergreen/config/axes.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ axes:
display_name: "MongoDB Latest"
variables:
MONGODB_VERSION: "latest"
- id: "8.2"
display_name: "MongoDB 8.2"
variables:
MONGODB_VERSION: "8.2"
- id: "8.0"
display_name: "MongoDB 8.0"
variables:
Expand Down Expand Up @@ -106,10 +110,18 @@ axes:
display_name: ruby-3.3
variables:
RVM_RUBY: "ruby-3.3"
- id: "ruby-head"
display_name: ruby-head
- id: "ruby-3.4"
display_name: ruby-3.4
variables:
RVM_RUBY: "ruby-3.4"
- id: "ruby-4.0"
display_name: ruby-4.0
variables:
RVM_RUBY: "ruby-head"
RVM_RUBY: "ruby-4.0"
- id: "ruby-dev"
display_name: ruby-dev
variables:
RVM_RUBY: "ruby-dev"

- id: "jruby"
display_name: JRuby Version
Expand All @@ -118,10 +130,17 @@ axes:
display_name: jruby-9.4
variables:
RVM_RUBY: "jruby-9.4"
- id: "jruby-10.0"
display_name: jruby-10.0
variables:
RVM_RUBY: "jruby-10.0"

- id: "os"
display_name: OS
values:
- id: ubuntu-24.04
display_name: "Ubuntu 24.04"
run_on: ubuntu2404-small
- id: ubuntu-22.04
display_name: "Ubuntu 22.04"
run_on: ubuntu2204-small
Expand Down
Loading
Loading