Merge branch 'main' into rv-add-strict-helpers

.github/workflows/ci.yml

@@ -14,46 +14,64 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.3
     - uses: actions/cache@v4
       with:
         path: vendor/bundle
-        key: gems-build-rails-main-ruby-2.7-${{ hashFiles('**/Gemfile.lock') }}
+        key: gems-build-rails-main-ruby-3.3-${{ hashFiles('**/Gemfile.lock') }}
     - name: Run benchmarks
       run: |
         bundle config path vendor/bundle
         bundle update
         bundle exec rake partial_benchmark
         bundle exec rake translatable_benchmark
   test:
-    name: test (${{ matrix.rails_version }}, ${{ matrix.ruby_version }}, ${{ matrix.mode }})
+    name: test (${{ matrix.rails_version }}, ${{ matrix.ruby_version }}, ${{ matrix.mode }}, yjit-${{matrix.yjit_mode}})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        rails_version: ["6.1", "7.0", "7.1", "main"]
-        ruby_version: ["3.1", "3.2", "3.3"]
-        mode: ["capture_patch_enabled", "capture_patch_disabled"]
         include:
-          # Run against all previously supported Rails versions for Ruby 3.0
           - ruby_version: "3.0"
             rails_version: "6.1"
             mode: "capture_patch_enabled"
+            yjit_mode: '0'
           - ruby_version: "3.0"
             rails_version: "6.1"
             mode: "capture_patch_disabled"
-          - ruby_version: "3.0"
+            yjit_mode: '0'
+          - ruby_version: "3.1"
             rails_version: "7.0"
             mode: "capture_patch_enabled"
-          - ruby_version: "3.0"
+            yjit_mode: '1'
+          - ruby_version: "3.1"
             rails_version: "7.0"
             mode: "capture_patch_disabled"
-          - ruby_version: "3.0"
+            yjit_mode: '0'
+          - ruby_version: "3.2"
             rails_version: "7.1"
             mode: "capture_patch_enabled"
-          - ruby_version: "3.0"
+            yjit_mode: '0'
+          - ruby_version: "3.2"
+            rails_version: "7.1"
+            mode: "capture_patch_disabled"
+            yjit_mode: '1'
+          - ruby_version: "3.3"
+            rails_version: "7.1"
+            mode: "capture_patch_enabled"
+            yjit_mode: '1'
+          - ruby_version: "3.3"
             rails_version: "7.1"
             mode: "capture_patch_disabled"
+            yjit_mode: '1'
+          - ruby_version: "head"
+            rails_version: "main"
+            mode: "capture_patch_disabled"
+            yjit_mode: '1'
+          - ruby_version: "head"
+            rails_version: "main"
+            mode: "capture_patch_enabled"
+            yjit_mode: '1'
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails_version }}.gemfile
     steps:
@@ -74,6 +92,7 @@ jobs:
         RAISE_ON_WARNING: 1
         RAILS_VERSION: ${{ matrix.rails_version }}
         CAPTURE_PATCH_ENABLED: ${{ matrix.mode == 'capture_patch_enabled' && 'true' || 'false' }}
+        RUBY_YJIT_ENABLE: ${{matrix.yjit_mode}}
     - name: Upload coverage results
       uses: actions/[email protected]
       if: always()
@@ -124,13 +143,13 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.3
     - name: Download coverage results
       uses: actions/download-artifact@v3
     - uses: actions/cache@v4
       with:
         path: vendor/bundle
-        key: gems-build-rails-main-ruby-2.7-${{ hashFiles('**/Gemfile.lock') }}
+        key: gems-build-rails-main-ruby-3.3-${{ hashFiles('**/Gemfile.lock') }}
     - name: Collate simplecov
       run: |
         bundle config path vendor/bundle