Skip to content

Commit 0574793

Browse files
authored
Merge branch 'main' into fix-auto_load_paths
2 parents 432e826 + 6a35673 commit 0574793

29 files changed

+378
-377
lines changed

.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Ruby
1717
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: 3.3
19+
ruby-version: 3.4
2020
bundler-cache: true
2121
- name: Run benchmarks
2222
run: |
@@ -59,6 +59,12 @@ jobs:
5959
- ruby_version: "3.3"
6060
rails_version: "8.0"
6161
mode: "capture_patch_enabled"
62+
- ruby_version: "3.4"
63+
rails_version: "8.0"
64+
mode: "capture_patch_disabled"
65+
- ruby_version: "3.4"
66+
rails_version: "8.0"
67+
mode: "capture_patch_enabled"
6268
- ruby_version: "head"
6369
rails_version: "main"
6470
mode: "capture_patch_disabled"
@@ -107,7 +113,7 @@ jobs:
107113
- name: Setup Ruby
108114
uses: ruby/setup-ruby@v1
109115
with:
110-
ruby-version: 3.3
116+
ruby-version: 3.4
111117
bundler-cache: true
112118
working-directory: 'view_component'
113119
- uses: actions/setup-node@v4
@@ -133,10 +139,10 @@ jobs:
133139
- name: Setup Ruby
134140
uses: ruby/setup-ruby@v1
135141
with:
136-
ruby-version: 3.3
142+
ruby-version: 3.4
137143
bundler-cache: true
138144
- name: Download coverage results
139-
uses: actions/[email protected].8
145+
uses: actions/[email protected].9
140146
- name: Collate simplecov
141147
run: |
142148
bundle exec rake coverage:report

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Setup Ruby
7171
uses: ruby/setup-ruby@v1
7272
with:
73-
ruby-version: 3.3
73+
ruby-version: 3.4
7474
- uses: actions/cache@v4
7575
with:
7676
path: vendor/bundle

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.3.0
1+
ruby 3.4.2

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
source "https://rubygems.org"
44
gemspec
55

6-
rails_version = (ENV["RAILS_VERSION"] || "~> 7.0.0").to_s
6+
rails_version = (ENV["RAILS_VERSION"] || "~> 8").to_s
77
gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
88

9-
ruby_version = (ENV["RUBY_VERSION"] || "~> 3.3").to_s
9+
ruby_version = (ENV["RUBY_VERSION"] || "~> 3.4").to_s
1010
ruby ruby_version

0 commit comments

Comments
 (0)