MONGOID-5818 Support Rails 8 (#5876) (#5897)

mongodb · Nov 8, 2024 · 8b38bfc · 8b38bfc
1 parent 2e2bbce
commit 8b38bfc
Show file tree

Hide file tree

Showing 19 changed files with 258 additions and 108 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -259,7 +259,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/tmp/rspec.xml
+        file: ./src/rspec.xml
 
   "run tests":
     - command: shell.exec
@@ -308,7 +308,7 @@ post:
   # Removed, causing timeouts
   # - func: "upload working dir"
   - func: "upload mo artifacts"
-  #- func: "upload test results"
+  # - func: "upload test results"
   - func: "upload test results to s3"
 
 task_groups:
@@ -472,6 +472,10 @@ axes:
         display_name: ruby-3.2
         variables:
           RVM_RUBY: "ruby-3.2"
+      - id: "ruby-3.3"
+        display_name: ruby-3.3
+        variables:
+          RVM_RUBY: "ruby-3.3"
       - id: "ruby-head"
         display_name: ruby-head
         variables:
@@ -491,6 +495,11 @@ axes:
       - id: actual-ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
+      - id: ubuntu-18.04
+        display_name: "Ubuntu 18.04"
+        run_on: ubuntu2004-small
+        variables:
+          DOCKER_DISTRO: ubuntu1804
       - id: ubuntu-20.04
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
@@ -587,6 +596,10 @@ axes:
         display_name: "Rails 7.2"
         variables:
           RAILS: "7.2"
+      - id: "8.0"
+        display_name: "Rails 8.0"
+        variables:
+          RAILS: "8.0"
 
   - id: "test-i18n-fallbacks"
     display_name: Test i18n fallbacks
@@ -655,7 +668,7 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['5.0']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -666,7 +679,7 @@ buildvariants:
     driver: ["current"]
     topology: '*'
     mongodb-version: ['4.4']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -688,7 +701,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
     topology: ['replica-set', 'sharded-cluster']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -697,33 +710,20 @@ buildvariants:
   matrix_spec:
     driver: [min]
     ruby: ["ruby-2.7"]
-    mongodb-version: "3.6"
+    mongodb-version: "5.0"
     topology: "standalone"
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
 
-- matrix_name: "rails-7"
-  matrix_spec:
-    ruby: ["ruby-3.2"]
-    driver: ["current"]
-    mongodb-version: "6.0"
-    topology: "standalone"
-    rails: ['7.0', '7.1', '7.2']
-    os: ubuntu-22.04
-    fle: helper
-  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
-  tasks:
-    - name: "test"
-
 - matrix_name: "bson-min"
   matrix_spec:
     driver: [bson-min]
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
     topology: "standalone"
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -734,11 +734,49 @@ buildvariants:
     ruby: ["ruby-3.0"]
     mongodb-version: "5.0"
     topology: "standalone"
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
 
+- matrix_name: "rails-master"
+  matrix_spec:
+    ruby: ["ruby-3.2"]
+    driver: ["current"]
+    mongodb-version: "7.0"
+    topology: "standalone"
+    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: "standalone"
+    rails: ['8.0']
+    os: ubuntu-22.04
+    fle: helper
+  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+  tasks:
+    - name: "test"
+
+- matrix_name: "rails-7"
+  matrix_spec:
+    ruby: ["ruby-3.2"]
+    driver: ["current"]
+    mongodb-version: "6.0"
+    topology: "standalone"
+    rails: ['7.0', '7.1', '7.2']
+    os: ubuntu-22.04
+    fle: helper
+  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+  tasks:
+    - name: "test"
 
 - matrix_name: "rails-6"
   matrix_spec:
@@ -747,7 +785,7 @@ buildvariants:
     mongodb-version: "6.0"
     topology: "standalone"
     rails: ['6.0', '6.1']
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
@@ -756,36 +794,49 @@ buildvariants:
   matrix_spec:
     ruby: "ruby-2.7"
     driver: ["current"]
-    mongodb-version: "4.2"
+    mongodb-version: "5.0"
     topology: "standalone"
     test-i18n-fallbacks: yes
-    os: rhel80
+    os: ubuntu-20.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
 
+- matrix_name: app-tests-rails-8
+  matrix_spec:
+    ruby: ["ruby-3.2"]
+    driver: ["current"]
+    mongodb-version: '7.0'
+    topology: standalone
+    app-tests: yes
+    rails: ['8.0']
+    os: ubuntu-22.04
+  display_name: "app tests ${driver}, ${ruby}, ${rails}"
+  tasks:
+    - name: "test"
+
 - matrix_name: app-tests-rails-7
   matrix_spec:
-    ruby: ["ruby-3.1", "ruby-3.2"]
+    ruby: ["ruby-3.2"]
     driver: ["current"]
     mongodb-version: '6.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.1', '7.0', '7.1', '7.2']
-    os: ubuntu-20.04
+    rails: ['7.0', '7.1', '7.2']
+    os: ubuntu-22.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
     - name: "test"
 
-- matrix_name: app-tests-rails-6-0
+- matrix_name: app-tests-rails-6
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
     mongodb-version: '5.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.0']
-    os: rhel80
+    rails: ['6.0', '6.1']
+    os: ubuntu-20.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"

diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -99,6 +99,10 @@ axes:
         display_name: ruby-3.2
         variables:
           RVM_RUBY: "ruby-3.2"
+      - id: "ruby-3.3"
+        display_name: ruby-3.3
+        variables:
+          RVM_RUBY: "ruby-3.3"
       - id: "ruby-head"
         display_name: ruby-head
         variables:
@@ -118,6 +122,11 @@ axes:
       - id: actual-ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
+      - id: ubuntu-18.04
+        display_name: "Ubuntu 18.04"
+        run_on: ubuntu2004-small
+        variables:
+          DOCKER_DISTRO: ubuntu1804
       - id: ubuntu-20.04
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
@@ -214,6 +223,10 @@ axes:
         display_name: "Rails 7.2"
         variables:
           RAILS: "7.2"
+      - id: "8.0"
+        display_name: "Rails 8.0"
+        variables:
+          RAILS: "8.0"
 
   - id: "test-i18n-fallbacks"
     display_name: Test i18n fallbacks

diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
@@ -233,7 +233,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/tmp/rspec.xml
+        file: ./src/rspec.xml
 
   "run tests":
     - command: shell.exec
@@ -282,7 +282,7 @@ post:
   # Removed, causing timeouts
   # - func: "upload working dir"
   - func: "upload mo artifacts"
-  #- func: "upload test results"
+  # - func: "upload test results"
   - func: "upload test results to s3"
 
 task_groups: