Merge branch 'main' into fix-coverage-segfault

Author: joelhawksley

.github/dependabot.yml

@@ -3,8 +3,8 @@ updates:
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
   - package-ecosystem: "bundler"
     directory: "/docs"
     schedule:
-      interval: "weekly"
+      interval: "daily"

.github/workflows/ci.yml

@@ -14,18 +14,18 @@ jobs:
   benchmark:
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: gemfiles/rails_8.0.gemfile
+      BUNDLE_GEMFILE: gemfiles/rails_8.1.gemfile
     steps:
     - uses: actions/checkout@v4.1.1
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.4
+        ruby-version: 4.0
         bundler-cache: true
     - name: Run benchmarks
       run: |
-        bundle exec appraisal rails-8.0 rake partial_benchmark
-        bundle exec appraisal rails-8.0 rake translatable_benchmark
+        bundle exec appraisal rails-8.1 rake partial_benchmark
+        bundle exec appraisal rails-8.1 rake translatable_benchmark
   test:
     name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
     runs-on: ubuntu-latest
@@ -40,7 +40,7 @@ jobs:
             rails_version: "7.2"
           - ruby_version: "3.4"
             rails_version: "8.0"
-          - ruby_version: "3.4"
+          - ruby_version: "4.0"
             rails_version: "8.1"
           - ruby_version: "head"
             rails_version: "main"
@@ -83,7 +83,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.4
+        ruby-version: 4.0
         bundler-cache: true
         working-directory: 'view_component'
     - uses: actions/setup-node@v4
@@ -99,7 +99,7 @@ jobs:
         bundle --quiet && bundle exec rake
       env:
         VIEW_COMPONENT_PATH: ../view_component
-        RAILS_VERSION: '8.0.2'
+        RAILS_VERSION: '8.1.0'
         PARALLEL_WORKERS: '1'
   coverage:
     needs: test
@@ -109,7 +109,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.4
+        ruby-version: 4.0
         bundler-cache: true
     - name: Download coverage results
       uses: actions/download-artifact@v4.3.0

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,25 @@
+name: Dependabot auto-merge
+
+on:
+  pull_request:
+    types: [opened]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Approve Dependabot PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/lint.yml

@@ -62,7 +62,12 @@ jobs:
     steps:
       - name: echo changed files
         run: |
-          if [[ ! "${{needs.changedfiles.outputs.markdown}}" == *"CHANGELOG.md"* ]]; then
+          # Filter out Gemfile.lock files from changed files
+          ALL_FILES="${{needs.changedfiles.outputs.all}}"
+          FILTERED_FILES=$(echo "$ALL_FILES" | tr ' ' '\n' | grep -v '^Gemfile\.lock$' | grep -v '^docs/Gemfile\.lock$' | tr '\n' ' ' | xargs)
+
+          # Only require changelog if there are other files changed
+          if [[ -n "$FILTERED_FILES" ]] && [[ ! "${{needs.changedfiles.outputs.markdown}}" == *"CHANGELOG.md"* ]]; then
             echo "::error file=CHANGELOG.md,line=1,col=1::Please make sure that you add a docs/CHANGELOG.md entry to describe the changes in this pull request."
             exit 1
           fi
@@ -73,7 +78,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.4
+        ruby-version: 4.0
     - uses: actions/cache@v4
       with:
         path: vendor/bundle

.tool-versions

@@ -1 +1 @@
-ruby 3.4.7
+ruby 4.0.1

Gemfile

@@ -3,11 +3,11 @@
 source "https://rubygems.org"
 gemspec
 
-rails_version = (ENV["RAILS_VERSION"] || "~> 8").to_s
+rails_version = (ENV["RAILS_VERSION"] || "~> 8.1").to_s
 
 gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
 
-ruby_version = (ENV["RUBY_VERSION"] || "~> 3.4").to_s
+ruby_version = (ENV["RUBY_VERSION"] || "~> 4.0").to_s
 ruby ruby_version
 
 group :development, :test do
@@ -26,6 +26,8 @@ group :development, :test do
   gem "m", "~> 1"
   gem "method_source", "~> 1"
   gem "minitest", "~> 6"
+  gem "minitest-mock"
+  gem "nokogiri", "1.19.0"
   gem "propshaft", "~> 1"
   gem "puma", ">= 6"
   gem "rake", "~> 13"