Skip to content

Commit

Permalink
MONGOID-5689 Add Rails 7.1 support (#5730)
Browse files Browse the repository at this point in the history
  • Loading branch information
@comandeo-mongo
comandeo-mongo authored Oct 11, 2023
1 parent ce49093 commit e52036b
Show file tree
Hide file tree
Showing 16 changed files with 940 additions and 114 deletions.
106 changes: 56 additions & 50 deletions .evergreen/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ functions:
DRIVER="${DRIVER}" \
I18N="${I18N}" \
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
./egos .evergreen/run-tests.sh
FLE="${FLE}" \
APP_TESTS="${APP_TESTS}" \
.evergreen/run-tests-docker.sh
"fix absolute paths":
- command: shell.exec
Expand Down Expand Up @@ -325,10 +327,18 @@ axes:
- id: "mongodb-version"
display_name: MongoDB Version
values:
- id: "latest"
display_name: "MongoDB Latest"
variables:
VERSION: "latest"
- id: "7.0"
display_name: "MongoDB 7.0"
variables:
VERSION: "7.0"
- id: "6.0"
display_name: "MongoDB 6.0"
variables:
VERSION: "5.0"
VERSION: "6.0"
- id: "5.3"
display_name: "MongoDB 5.3"
variables:
Expand Down Expand Up @@ -430,29 +440,19 @@ axes:
- id: "os"
display_name: OS
values:
- id: ubuntu-16.04
display_name: "Ubuntu 16.04"
run_on: ubuntu1604-small
variables:
DOCKER_DISTRO: ubuntu1604
- id: ubuntu-18.04
display_name: "Ubuntu 18.04"
run_on: ubuntu1804-small
variables:
DOCKER_DISTRO: ubuntu1804
- id: ubuntu-20.04
display_name: "Ubuntu 20.04"
- id: ubuntu-22.04
display_name: "Ubuntu 22.04"
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: ubuntu2004
- id: rhel70
display_name: "RHEL 7.0"
run_on: rhel70-small
DOCKER_DISTRO: ubuntu2204
- id: debian11
display_name: "Debian 11"
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: rhel70
DOCKER_DISTRO: debian11
- id: rhel80
display_name: "RHEL 8.0"
run_on: rhel80-small
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: rhel80

Expand Down Expand Up @@ -527,6 +527,10 @@ axes:
display_name: "Rails 7.0"
variables:
RAILS: "7.0"
- id: "7.1"
display_name: "Rails 7.1"
variables:
RAILS: "7.1"

- id: "i18n"
display_name: I18n version
Expand All @@ -553,25 +557,26 @@ axes:
display_name: Yes
variables:
APP_TESTS: yes

buildvariants:
- matrix_name: "ruby-3.1"
- matrix_name: "mongodb-latest"
matrix_spec:
ruby: ["ruby-3.1"]
driver: ["current"]
topology: '*'
mongodb-version: ['6.0']
os: ubuntu-20.04
mongodb-version: ['latest']
os: debian11
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"

- matrix_name: "mongodb-5.3"
- matrix_name: "ruby-3.1"
matrix_spec:
ruby: ["ruby-3.1"]
driver: ["current"]
topology: '*'
mongodb-version: ['5.3']
os: ubuntu-20.04
mongodb-version: ['6.0']
os: ubuntu-22.04
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -582,7 +587,7 @@ buildvariants:
driver: ["current"]
topology: ['replica-set']
mongodb-version: ['5.0']
os: ubuntu-20.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -593,7 +598,7 @@ buildvariants:
driver: ["current"]
topology: ['replica-set', 'sharded-cluster']
mongodb-version: '5.0'
os: ubuntu-18.04
os: rhel80
display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -604,7 +609,7 @@ buildvariants:
driver: ["current"]
topology: '*'
mongodb-version: ['4.4']
os: ubuntu-18.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -615,7 +620,7 @@ buildvariants:
driver: ["current"]
topology: ['replica-set']
mongodb-version: ['4.0']
os: ubuntu-16.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -624,9 +629,9 @@ buildvariants:
matrix_spec:
driver: [master, stable]
ruby: ["ruby-3.1"]
mongodb-version: "5.0"
mongodb-version: "6.0"
topology: ['replica-set', 'sharded-cluster']
os: ubuntu-20.04
os: debian11
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -637,7 +642,7 @@ buildvariants:
ruby: ["ruby-2.6"]
mongodb-version: "4.0"
topology: ['replica-set', 'sharded-cluster']
os: ubuntu-18.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -648,19 +653,19 @@ buildvariants:
ruby: ["ruby-2.6"]
mongodb-version: "3.6"
topology: "standalone"
os: ubuntu-16.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"

- matrix_name: "rails-7"
matrix_spec:
ruby: ["ruby-3.0"]
ruby: ["ruby-3.1"]
driver: ["current"]
mongodb-version: "5.0"
mongodb-version: "6.0"
topology: "standalone"
rails: ['7.0']
os: ubuntu-20.04
rails: ['7.0', '7.1']
os: ubuntu-22.04
display_name: "${rails}, ${driver}, ${mongodb-version}"
tasks:
- name: "test"
Expand All @@ -671,7 +676,7 @@ buildvariants:
ruby: ["ruby-2.7"]
mongodb-version: "5.0"
topology: "standalone"
os: ubuntu-18.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -682,7 +687,7 @@ buildvariants:
ruby: ["ruby-3.0"]
mongodb-version: "5.0"
topology: "standalone"
os: ubuntu-18.04
os: rhel80
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
tasks:
- name: "test"
Expand All @@ -692,10 +697,10 @@ buildvariants:
matrix_spec:
ruby: ["ruby-3.0"]
driver: ["current"]
mongodb-version: "5.0"
mongodb-version: "6.0"
topology: "standalone"
rails: ['6.0', '6.1']
os: ubuntu-20.04
os: rhel80
display_name: "${rails}, ${driver}, ${mongodb-version}"
tasks:
- name: "test"
Expand All @@ -707,7 +712,7 @@ buildvariants:
mongodb-version: "4.0"
topology: "standalone"
rails: ['5.2']
os: ubuntu-18.04
os: rhel80
display_name: "${rails}, ${driver}, ${mongodb-version}"
tasks:
- name: "test"
Expand All @@ -719,7 +724,7 @@ buildvariants:
mongodb-version: "4.4"
topology: "standalone"
i18n: '1.0'
os: ubuntu-18.04
os: rhel80
display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
tasks:
- name: "test"
Expand All @@ -732,7 +737,7 @@ buildvariants:
topology: "standalone"
i18n: '*'
test-i18n-fallbacks: yes
os: ubuntu-18.04
os: rhel80
display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
tasks:
- name: "test"
Expand All @@ -741,11 +746,11 @@ buildvariants:
matrix_spec:
ruby: ["ruby-3.0", "ruby-3.1"]
driver: ["current"]
mongodb-version: '5.0'
mongodb-version: '6.0'
topology: standalone
app-tests: yes
rails: ['6.0', '6.1', '7.0']
os: ubuntu-20.04
rails: ['6.0', '6.1', '7.0', '7.1']
os: rhel80
display_name: "app tests ${driver}, ${ruby}, ${rails}"
tasks:
- name: "test"
Expand All @@ -758,7 +763,7 @@ buildvariants:
topology: standalone
app-tests: yes
rails: ['5.2']
os: ubuntu-18.04
os: rhel80
display_name: "app tests ${driver}, ${ruby}, ${rails}"
tasks:
- name: "test"
Expand All @@ -771,7 +776,8 @@ buildvariants:
topology: standalone
app-tests: yes
rails: ['6.0']
os: ubuntu-18.04
os: ubuntu-22.04
display_name: "app tests ${driver}, ${jruby}"
tasks:
- name: "test"

41 changes: 22 additions & 19 deletions .evergreen/config/axes.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@ axes:
- id: "mongodb-version"
display_name: MongoDB Version
values:
- id: "latest"
display_name: "MongoDB Latest"
variables:
VERSION: "latest"
- id: "7.0"
display_name: "MongoDB 7.0"
variables:
VERSION: "7.0"
- id: "6.0"
display_name: "MongoDB 6.0"
variables:
VERSION: "5.0"
VERSION: "6.0"
- id: "5.3"
display_name: "MongoDB 5.3"
variables:
Expand Down Expand Up @@ -107,29 +115,19 @@ axes:
- id: "os"
display_name: OS
values:
- id: ubuntu-16.04
display_name: "Ubuntu 16.04"
run_on: ubuntu1604-small
variables:
DOCKER_DISTRO: ubuntu1604
- id: ubuntu-18.04
display_name: "Ubuntu 18.04"
run_on: ubuntu1804-small
variables:
DOCKER_DISTRO: ubuntu1804
- id: ubuntu-20.04
display_name: "Ubuntu 20.04"
- id: ubuntu-22.04
display_name: "Ubuntu 22.04"
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: ubuntu2004
- id: rhel70
display_name: "RHEL 7.0"
run_on: rhel70-small
DOCKER_DISTRO: ubuntu2204
- id: debian11
display_name: "Debian 11"
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: rhel70
DOCKER_DISTRO: debian11
- id: rhel80
display_name: "RHEL 8.0"
run_on: rhel80-small
run_on: ubuntu2004-small
variables:
DOCKER_DISTRO: rhel80

Expand Down Expand Up @@ -204,6 +202,10 @@ axes:
display_name: "Rails 7.0"
variables:
RAILS: "7.0"
- id: "7.1"
display_name: "Rails 7.1"
variables:
RAILS: "7.1"

- id: "i18n"
display_name: I18n version
Expand All @@ -230,3 +232,4 @@ axes:
display_name: Yes
variables:
APP_TESTS: yes

4 changes: 3 additions & 1 deletion .evergreen/config/commands.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ functions:
DRIVER="${DRIVER}" \
I18N="${I18N}" \
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
./egos .evergreen/run-tests.sh
FLE="${FLE}" \
APP_TESTS="${APP_TESTS}" \
.evergreen/run-tests-docker.sh

"fix absolute paths":
- command: shell.exec
Expand Down
Loading

0 comments on commit e52036b

Please sign in to comment.