Skip to content

Commit 8a5d64c

Browse files
committed
Update dependencies and lock minitest to v5
Additionally: - Test against Rails 8.1 stable - Update NodeJS to 24 Ref: rails/rails@99395e1
1 parent 542dffb commit 8a5d64c

File tree

14 files changed

+61
-20
lines changed

14 files changed

+61
-20
lines changed

.github/workflows/eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node
2020
uses: actions/setup-node@v6
2121
with:
22-
node-version: '22'
22+
node-version: '24'
2323
- name: Install node dependencies
2424
run: pnpm install
2525
- name: Run JavaScript linter

.github/workflows/javascript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
- name: Set up Ruby
1919
uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: '3.4'
21+
ruby-version: '4.0'
2222
bundler-cache: true
2323
- uses: pnpm/action-setup@v4
2424
- name: Set up Node
2525
uses: actions/setup-node@v6
2626
with:
27-
node-version: '22'
27+
node-version: '24'
2828
- name: Install node dependencies
2929
run: pnpm install
3030
- name: Run tests

.github/workflows/rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ubuntu-latest]
22-
ruby-version: ['3.4']
22+
ruby-version: ['4.0']
2323

2424
steps:
2525
- uses: actions/checkout@v6

.github/workflows/ruby.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
ruby-version: ['3.1', '3.2', '3.3', '3.4']
19-
gemfile: [rails_6.1, rails_7.0, rails_7.1, rails_7.2, rails_8.0]
18+
ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
19+
gemfile: [rails_6.1, rails_7.0, rails_7.1, rails_7.2, rails_8.0, rails_8.1]
2020
channel: ['stable']
2121

2222
include:
@@ -29,6 +29,9 @@ jobs:
2929
- ruby-version: '3.4'
3030
gemfile: rails_edge
3131
channel: 'experimental'
32+
- ruby-version: '4.0'
33+
gemfile: rails_edge
34+
channel: 'experimental'
3235
- ruby-version: 'head'
3336
gemfile: rails_7.1
3437
channel: 'experimental'
@@ -38,13 +41,18 @@ jobs:
3841
- ruby-version: 'head'
3942
gemfile: rails_8.0
4043
channel: 'experimental'
44+
- ruby-version: 'head'
45+
gemfile: rails_8.1
46+
channel: 'experimental'
4147
- ruby-version: 'head'
4248
gemfile: rails_edge
4349
channel: 'experimental'
4450

4551
exclude:
4652
- ruby-version: '3.1'
4753
gemfile: rails_8.0
54+
- ruby-version: '3.1'
55+
gemfile: rails_8.1
4856
- ruby-version: '3.2'
4957
gemfile: rails_6.1
5058
- ruby-version: '3.3'
@@ -53,6 +61,14 @@ jobs:
5361
gemfile: rails_6.1
5462
- ruby-version: '3.4'
5563
gemfile: rails_7.0
64+
- ruby-version: '4.0'
65+
gemfile: rails_6.1
66+
- ruby-version: '4.0'
67+
gemfile: rails_7.0
68+
- ruby-version: '4.0'
69+
gemfile: rails_7.1
70+
- ruby-version: '4.0'
71+
gemfile: rails_7.2
5672

5773
env:
5874
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

Appraisals

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
appraise 'rails-6.1' do
44
gem 'rails', '~> 6.1.0'
55
gem 'sqlite3', '~> 1.7'
6-
gem 'concurrent-ruby', '< 1.3.5' # Ref: rails/rails#54260
76
end
87

98
appraise 'rails-7.0' do
109
gem 'rails', '~> 7.0.0'
1110
gem 'sqlite3', '~> 1.7'
12-
gem 'concurrent-ruby', '< 1.3.5' # Ref: rails/rails#54260
1311
end
1412

1513
appraise 'rails-7.1' do
@@ -24,6 +22,10 @@ appraise 'rails-8.0' do
2422
gem 'rails', '~> 8.0.0'
2523
end
2624

25+
appraise 'rails-8.1' do
26+
gem 'rails', '~> 8.1.0'
27+
end
28+
2729
appraise 'rails-edge' do
2830
gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
2931
end

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gemspec
88
gem 'appraisal'
99
gem 'byebug'
1010
gem 'm'
11-
gem 'minitest'
11+
gem 'minitest', '~> 5.27' # TODO: relax when the minimum required Rails version will include rails/rails@99395e1ea401acbc23d4f6b2a8657cdb82f921bd
1212
gem 'mocha'
1313
gem 'rake'
1414
gem 'rubocop'

gemfiles/rails_6.1.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "appraisal"
66
gem "byebug"
77
gem "m"
8-
gem "minitest"
8+
gem "minitest", "~> 5.27"
99
gem "mocha"
1010
gem "rake"
1111
gem "rubocop"
@@ -21,6 +21,5 @@ gem "sinatra"
2121
gem "sqlite3", "~> 1.7"
2222
gem "webrick"
2323
gem "rails", "~> 6.1.0"
24-
gem "concurrent-ruby", "< 1.3.5"
2524

2625
gemspec path: "../"

gemfiles/rails_7.0.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "appraisal"
66
gem "byebug"
77
gem "m"
8-
gem "minitest"
8+
gem "minitest", "~> 5.27"
99
gem "mocha"
1010
gem "rake"
1111
gem "rubocop"
@@ -21,6 +21,5 @@ gem "sinatra"
2121
gem "sqlite3", "~> 1.7"
2222
gem "webrick"
2323
gem "rails", "~> 7.0.0"
24-
gem "concurrent-ruby", "< 1.3.5"
2524

2625
gemspec path: "../"

gemfiles/rails_7.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "appraisal"
66
gem "byebug"
77
gem "m"
8-
gem "minitest"
8+
gem "minitest", "~> 5.27"
99
gem "mocha"
1010
gem "rake"
1111
gem "rubocop"

gemfiles/rails_7.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "appraisal"
66
gem "byebug"
77
gem "m"
8-
gem "minitest"
8+
gem "minitest", "~> 5.27"
99
gem "mocha"
1010
gem "rake"
1111
gem "rubocop"

0 commit comments

Comments
 (0)