Merge branch 'main' into derails

Author: joelhawksley

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
   test:
     name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby_version == 'head' }}
     strategy:
       fail-fast: false
       matrix:
@@ -39,6 +40,8 @@ jobs:
             rails_version: "7.2"
           - ruby_version: "3.4"
             rails_version: "8.0"
+          - ruby_version: "3.4"
+            rails_version: "8.1"
           - ruby_version: "head"
             rails_version: "main"
     env:

.tool-versions

@@ -1 +1 @@
-ruby 3.4.3
+ruby 3.4.7

Appraisals

@@ -33,7 +33,20 @@ appraise "rails-8.0" do
   end
 end
 
+appraise "rails-8.1" do
+  ruby "~> 3.4.0"
+
+  gem "rails", "~> 8.1.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 8"
+  end
+end
+
 appraise "rails-main" do
+  ruby "4.0.0.dev"
+
   gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
   gem "rails", github: "rails/rails", branch: "main"
 

Gemfile

@@ -13,22 +13,24 @@ ruby ruby_version
 group :development, :test do
   gem "allocation_stats"
   gem "appraisal", "~> 2"
+  gem "appraisal-run", "~> 1.1"
   gem "benchmark-ips", "~> 2"
   gem "better_html"
-  gem "bundler", "~> 2"
+  gem "bundler"
   gem "capybara", "~> 3"
   gem "cuprite"
   gem "dry-initializer", require: true
   gem "erb_lint"
-  gem "haml", "~> 6"
+  gem "haml", "~> 7"
   gem "jbuilder", "~> 2"
   gem "m", "~> 1"
   gem "method_source", "~> 1"
   gem "minitest", "~> 5"
   gem "propshaft", "~> 1"
-  gem "puma", "~> 6"
+  gem "puma", ">= 6"
   gem "rake", "~> 13"
   gem "rails-dom-testing", "~> 2.3.0"
+  gem "reactionview"
   gem "redis"
   gem "rspec-rails"
   gem "rubocop-md", "~> 2"