Skip to content

Commit 170bf5e

Browse files
authored
Support Rails 7.1 (#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
1 parent 07e0689 commit 170bf5e

File tree

9 files changed

+74
-13
lines changed

9 files changed

+74
-13
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
- rails_version: "main"
4343
ruby_version: "3.1"
4444
mode: "capture_patch_enabled"
45+
- rails_version: "7.1.1"
46+
ruby_version: "3.2"
47+
mode: "capture_patch_enabled"
4548
- rails_version: "main"
4649
ruby_version: "3.2"
4750
mode: "capture_patch_enabled"
@@ -60,6 +63,9 @@ jobs:
6063
- rails_version: "main"
6164
ruby_version: "3.1"
6265
mode: "capture_patch_disabled"
66+
- rails_version: "7.1.1"
67+
ruby_version: "3.2"
68+
mode: "capture_patch_disabled"
6369
- rails_version: "main"
6470
ruby_version: "3.2"
6571
mode: "capture_patch_disabled"
@@ -105,7 +111,7 @@ jobs:
105111
- name: Setup Ruby
106112
uses: ruby/setup-ruby@v1
107113
with:
108-
ruby-version: 3.1
114+
ruby-version: 3.2
109115
- uses: actions/setup-node@v4
110116
with:
111117
node-version: 16
@@ -125,7 +131,7 @@ jobs:
125131
bundle exec rake
126132
env:
127133
VIEW_COMPONENT_PATH: ../view_component
128-
RAILS_VERSION: '7.0.3'
134+
RAILS_VERSION: '7.1.1'
129135
PARALLEL_WORKERS: '1'
130136
coverage:
131137
needs: test
@@ -148,4 +154,4 @@ jobs:
148154
bundle update
149155
bundle exec rake coverage:report
150156
env:
151-
RAILS_VERSION: '~> 7.0.0'
157+
RAILS_VERSION: '~> 7.1.0'

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ jobs:
7070
- name: Setup Ruby
7171
uses: ruby/setup-ruby@v1
7272
with:
73-
ruby-version: 2.7
73+
ruby-version: 3.2
7474
- uses: actions/cache@v3
7575
with:
7676
path: vendor/bundle
77-
key: gems-build-rails-main-ruby-2.7-${{ hashFiles('**/Gemfile.lock') }}
77+
key: gems-build-rails-7.1-ruby-3.2-${{ hashFiles('**/Gemfile.lock') }}
7878
- name: Lint with Rubocop and ERB Lint
7979
run: |
8080
bundle config path vendor/bundle
81-
bundle install
81+
bundle update
8282
bundle exec standardrb -r "rubocop-md"
8383
bundle exec erblint **/*.html.erb
8484
env:
85-
RAILS_VERSION: '~> 7.0.0'
85+
RAILS_VERSION: '~> 7.1.0'

Appraisals

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ appraise "rails-7.0" do
2828
gem "tailwindcss-rails", "~> 2.0"
2929
end
3030

31+
appraise "rails-7.1" do
32+
gem "rails", "~> 7.1.0"
33+
gem "tailwindcss-rails", "~> 2.0"
34+
end
35+
3136
appraise "rails-head" do
3237
gem "rails", github: "rails/rails", branch: "main"
3338
gem "tailwindcss-rails", "~> 2.0"

docs/CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@ nav_order: 5
1010

1111
## main
1212

13-
* Document the capture compatibility patch on the Known issues page
13+
* Support Rails 7.1 in CI.
14+
15+
*Reegan Viljoen*
16+
*Cameron Dutro*
17+
18+
* Document the capture compatibility patch on the Known issues page.
1419

1520
*Simon Fish*
1621

1722
* Add Simundia to list of companies using ViewComponent.
1823

1924
*Alexandre Ignjatovic*
2025

21-
* Reduce UnboundMethod objects by memoizing initialize_parameters
26+
* Reduce UnboundMethod objects by memoizing initialize_parameters.
2227

2328
*Rainer Borene*
2429

gemfiles/rails_6.0.gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ source "https://rubygems.org"
44

55
gem "capybara", "~> 3"
66
gem "rails", "~> 6.0.0"
7-
gem "rspec-rails", "~> 5.1"
7+
gem "rspec-rails", "~> 5"
8+
gem "debug"
89
gem "tailwindcss-rails", "~> 2.0"
910

11+
group :test do
12+
gem "cuprite", "~> 0.8"
13+
gem "puma", "~> 6"
14+
gem "selenium-webdriver", "4.9.0"
15+
end
16+
1017
gemspec path: "../"

gemfiles/rails_6.1.gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ source "https://rubygems.org"
44

55
gem "capybara", "~> 3"
66
gem "rails", "~> 6.1.0"
7-
gem "rspec-rails", "~> 5.1"
7+
gem "rspec-rails", "~> 5"
8+
gem "debug"
89
gem "tailwindcss-rails", "~> 2.0"
910
gem "net-smtp", require: false
1011
gem "net-imap", require: false
1112
gem "net-pop", require: false
1213

14+
group :test do
15+
gem "cuprite", "~> 0.8"
16+
gem "puma", "~> 6"
17+
gem "selenium-webdriver", "4.9.0"
18+
end
19+
1320
gemspec path: "../"

gemfiles/rails_7.0.gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ source "https://rubygems.org"
44

55
gem "capybara", "~> 3"
66
gem "rails", "~> 7.0.0"
7-
gem "rspec-rails", "~> 5.1"
7+
gem "rspec-rails", "~> 5"
8+
gem "debug"
89
gem "tailwindcss-rails", "~> 2.0"
910

11+
group :test do
12+
gem "cuprite", "~> 0.8"
13+
gem "puma", "~> 6"
14+
gem "selenium-webdriver", "4.9.0"
15+
end
16+
1017
gemspec path: "../"

gemfiles/rails_7.1.gemfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "capybara", "~> 3"
6+
gem "rails", "~> 7.1.0"
7+
gem "rspec-rails", "~> 5"
8+
gem "debug"
9+
gem "tailwindcss-rails", "~> 2.0"
10+
11+
group :test do
12+
gem "cuprite", "~> 0.8"
13+
gem "puma", "~> 6"
14+
gem "selenium-webdriver", "4.9.0"
15+
end
16+
17+
gemspec path: "../"

gemfiles/rails_head.gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ source "https://rubygems.org"
44

55
gem "capybara", "~> 3"
66
gem "rails", github: "rails/rails", branch: "main"
7-
gem "rspec-rails", "~> 5.1"
7+
gem "rspec-rails", "~> 5"
8+
gem "debug"
89
gem "tailwindcss-rails", "~> 2.0"
910

11+
group :test do
12+
gem "cuprite", "~> 0.8"
13+
gem "puma", "~> 6"
14+
gem "selenium-webdriver", "4.9.0"
15+
end
16+
1017
gemspec path: "../"

0 commit comments

Comments
 (0)