Support Rails 7.1 (ViewComponent#1889)

* Support Rails 7.1 * Add changelog entry * Use Ruby 3.2 in more places; give @reeganviljoen credit for the 7.1 upgrade :) * Fix cache key * More cache key fixes? * Ok, let setup-ruby do the caching * For f*cks sake
claudiob · Dec 22, 2023 · 9f0b0d3 · 9f0b0d3
1 parent 3366c0b
commit 9f0b0d3
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,6 +42,9 @@ jobs:
           - rails_version: "main"
             ruby_version: "3.1"
             mode: "capture_patch_enabled"
+          - rails_version: "7.1.1"
+            ruby_version: "3.2"
+            mode: "capture_patch_enabled"
           - rails_version: "main"
             ruby_version: "3.2"
             mode: "capture_patch_enabled"
@@ -60,6 +63,9 @@ jobs:
           - rails_version: "main"
             ruby_version: "3.1"
             mode: "capture_patch_disabled"
+          - rails_version: "7.1.1"
+            ruby_version: "3.2"
+            mode: "capture_patch_disabled"
           - rails_version: "main"
             ruby_version: "3.2"
             mode: "capture_patch_disabled"
@@ -105,7 +111,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.2
     - uses: actions/setup-node@v4
       with:
         node-version: 16
@@ -125,7 +131,7 @@ jobs:
         bundle exec rake
       env:
         VIEW_COMPONENT_PATH: ../view_component
-        RAILS_VERSION: '7.0.3'
+        RAILS_VERSION: '7.1.1'
         PARALLEL_WORKERS: '1'
   coverage:
     needs: test
@@ -148,4 +154,4 @@ jobs:
         bundle update
         bundle exec rake coverage:report
       env:
-        RAILS_VERSION: '~> 7.0.0'
+        RAILS_VERSION: '~> 7.1.0'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -70,16 +70,16 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.2
     - uses: actions/cache@v3
       with:
         path: vendor/bundle
-        key: gems-build-rails-main-ruby-2.7-${{ hashFiles('**/Gemfile.lock') }}
+        key: gems-build-rails-7.1-ruby-3.2-${{ hashFiles('**/Gemfile.lock') }}
     - name: Lint with Rubocop and ERB Lint
       run: |
         bundle config path vendor/bundle
-        bundle install
+        bundle update
         bundle exec standardrb -r "rubocop-md"
         bundle exec erblint **/*.html.erb
       env:
-        RAILS_VERSION: '~> 7.0.0'
+        RAILS_VERSION: '~> 7.1.0'
diff --git a/Appraisals b/Appraisals
@@ -28,6 +28,11 @@ appraise "rails-7.0" do
   gem "tailwindcss-rails", "~> 2.0"
 end
 
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
+  gem "tailwindcss-rails", "~> 2.0"
+end
+
 appraise "rails-head" do
   gem "rails", github: "rails/rails", branch: "main"
   gem "tailwindcss-rails", "~> 2.0"

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -10,15 +10,20 @@ nav_order: 5
 
 ## main
 
-* Document the capture compatibility patch on the Known issues page
+* Support Rails 7.1 in CI.
+
+    *Reegan Viljoen*
+    *Cameron Dutro*
+
+* Document the capture compatibility patch on the Known issues page.
 
     *Simon Fish*
 
 * Add Simundia to list of companies using ViewComponent.
 
     *Alexandre Ignjatovic*
 
-* Reduce UnboundMethod objects by memoizing initialize_parameters
+* Reduce UnboundMethod objects by memoizing initialize_parameters.
 
     *Rainer Borene*
 

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -4,7 +4,14 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3"
 gem "rails", "~> 6.0.0"
-gem "rspec-rails", "~> 5.1"
+gem "rspec-rails", "~> 5"
+gem "debug"
 gem "tailwindcss-rails", "~> 2.0"
 
+group :test do
+  gem "cuprite", "~> 0.8"
+  gem "puma", "~> 6"
+  gem "selenium-webdriver", "4.9.0"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -4,10 +4,17 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3"
 gem "rails", "~> 6.1.0"
-gem "rspec-rails", "~> 5.1"
+gem "rspec-rails", "~> 5"
+gem "debug"
 gem "tailwindcss-rails", "~> 2.0"
 gem "net-smtp", require: false
 gem "net-imap", require: false
 gem "net-pop", require: false
 
+group :test do
+  gem "cuprite", "~> 0.8"
+  gem "puma", "~> 6"
+  gem "selenium-webdriver", "4.9.0"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -4,7 +4,14 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3"
 gem "rails", "~> 7.0.0"
-gem "rspec-rails", "~> 5.1"
+gem "rspec-rails", "~> 5"
+gem "debug"
 gem "tailwindcss-rails", "~> 2.0"
 
+group :test do
+  gem "cuprite", "~> 0.8"
+  gem "puma", "~> 6"
+  gem "selenium-webdriver", "4.9.0"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "capybara", "~> 3"
+gem "rails", "~> 7.1.0"
+gem "rspec-rails", "~> 5"
+gem "debug"
+gem "tailwindcss-rails", "~> 2.0"
+
+group :test do
+  gem "cuprite", "~> 0.8"
+  gem "puma", "~> 6"
+  gem "selenium-webdriver", "4.9.0"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_head.gemfile b/gemfiles/rails_head.gemfile
@@ -4,7 +4,14 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3"
 gem "rails", github: "rails/rails", branch: "main"
-gem "rspec-rails", "~> 5.1"
+gem "rspec-rails", "~> 5"
+gem "debug"
 gem "tailwindcss-rails", "~> 2.0"
 
+group :test do
+  gem "cuprite", "~> 0.8"
+  gem "puma", "~> 6"
+  gem "selenium-webdriver", "4.9.0"
+end
+
 gemspec path: "../"