Skip to content

Commit 6e1cddb

Browse files
authored
Merge pull request #26 from kvokka/bump-matrix-versions
Bump matrix versions
2 parents 19c37a1 + 3b1d9ca commit 6e1cddb

File tree

12 files changed

+50
-112
lines changed

12 files changed

+50
-112
lines changed

.github/workflows/ruby.yml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,28 @@ jobs:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
ruby-version: ['2.6', '2.7', '3.0', '3.1']
25+
ruby-version: ['3.1', '3.2', '3.3']
2626
gemfile:
27-
- gemfiles/rails_5.gemfile
28-
- gemfiles/rails_5_1.gemfile
29-
- gemfiles/rails_5_2.gemfile
30-
- gemfiles/rails_6_0.gemfile
31-
- gemfiles/rails_6_1.gemfile
3227
- gemfiles/rails_7_0.gemfile
33-
- gemfiles/activerecord_5_2.gemfile
34-
- gemfiles/activerecord_6_0.gemfile
35-
- gemfiles/activerecord_6_1.gemfile
28+
- gemfiles/rails_7_1.gemfile
29+
- gemfiles/rails_7_2.gemfile
30+
- gemfiles/rails_8_0.gemfile
3631
- gemfiles/activerecord_7_0.gemfile
32+
- gemfiles/activerecord_7_1.gemfile
33+
- gemfiles/activerecord_7_2.gemfile
34+
- gemfiles/activerecord_8_0.gemfile
3735
exclude:
38-
- ruby-version: 3.0
39-
gemfile: gemfiles/rails_5.gemfile
40-
- ruby-version: 3.1
41-
gemfile: gemfiles/rails_5.gemfile
42-
- ruby-version: 3.0
43-
gemfile: gemfiles/rails_5_1.gemfile
44-
- ruby-version: 3.1
45-
gemfile: gemfiles/rails_5_1.gemfile
46-
- ruby-version: 3.0
47-
gemfile: gemfiles/rails_5_2.gemfile
48-
- ruby-version: 3.1
49-
gemfile: gemfiles/rails_5_2.gemfile
50-
- ruby-version: 3.0
51-
gemfile: gemfiles/activerecord_5_2.gemfile
52-
- ruby-version: 3.1
53-
gemfile: gemfiles/activerecord_5_2.gemfile
54-
- ruby-version: 2.6
55-
gemfile: gemfiles/rails_7_0.gemfile
56-
- ruby-version: 2.6
57-
gemfile: gemfiles/activerecord_7_0.gemfile
36+
- ruby-version: '3.1'
37+
gemfile: gemfiles/rails_8_0.gemfile
38+
- ruby-version: '3.1'
39+
gemfile: gemfiles/activerecord_8_0.gemfile
5840

5941
steps:
6042
- uses: actions/checkout@v3
6143
- name: Set up Ruby
6244
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
6345
# change this to (see https://github.com/ruby/setup-ruby#versioning):
64-
# uses: ruby/setup-ruby@v1
65-
uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
46+
uses: ruby/setup-ruby@v1
6647
with:
6748
ruby-version: ${{ matrix.ruby-version }}
6849
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

Appraisals

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,44 @@
11
# frozen_string_literal: true
22

3-
appraise 'rails-5' do
4-
gem 'rails', '~> 5.0.0'
5-
gem 'sqlite3', '~> 1.3.6'
6-
end
7-
8-
appraise 'rails-5-1' do
9-
gem 'rails', '~> 5.1.0'
10-
gem 'sqlite3', '~> 1.4'
3+
appraise 'rails-7-0' do
4+
gem 'rails', '~> 7.0.0'
5+
gem 'sqlite3', '~> 1.6'
116
end
127

13-
appraise 'rails-5-2' do
14-
gem 'rails', '~> 5.2.0'
15-
gem 'sqlite3', '~> 1.4'
8+
appraise 'rails-7-1' do
9+
gem 'rails', '~> 7.1.0'
10+
gem 'sqlite3', '~> 2.0'
1611
end
1712

18-
appraise 'rails-6-0' do
19-
gem 'rails', '~> 6.0.0'
20-
gem 'sqlite3', '~> 1.4'
13+
appraise 'rails-7-2' do
14+
gem 'rails', '~> 7.2.0'
15+
gem 'sqlite3', '~> 2.0'
2116
end
2217

23-
appraise 'rails-6-1' do
24-
gem 'rails', '~> 6.1.0'
25-
gem 'sqlite3', '~> 1.4'
18+
appraise 'rails-8-0' do
19+
gem 'rails', '~> 8.0.0'
20+
gem 'sqlite3', '~> 2.0'
2621
end
2722

28-
appraise 'rails-7-0' do
29-
gem 'rails', '~> 7.0.0'
30-
gem 'sqlite3', '~> 1.6'
31-
end
32-
33-
appraise 'activerecord-5-2' do
34-
gem 'activerecord', '~> 5.2.0'
23+
appraise 'activerecord-7-0' do
24+
gem 'activerecord', '~> 7.0.0'
3525
gem 'rake'
36-
gem 'sqlite3', '~> 1.4'
26+
gem 'sqlite3', '~> 1.6'
3727
end
3828

39-
appraise 'activerecord-6-0' do
40-
gem 'activerecord', '~> 6.0.0'
29+
appraise 'activerecord-7-1' do
30+
gem 'activerecord', '~> 7.1.0'
4131
gem 'rake'
42-
gem 'sqlite3', '~> 1.4'
32+
gem 'sqlite3', '~> 2.0'
4333
end
4434

45-
appraise 'activerecord-6-1' do
46-
gem 'activerecord', '~> 6.1.0'
35+
appraise 'activerecord-7-2' do
36+
gem 'activerecord', '~> 7.2.0'
4737
gem 'rake'
48-
gem 'sqlite3', '~> 1.4'
38+
gem 'sqlite3', '~> 2.0'
4939
end
50-
51-
appraise 'activerecord-7-0' do
52-
gem 'activerecord', '~> 7.0.0'
40+
appraise 'activerecord-8-0' do
41+
gem 'activerecord', '~> 8.0.0'
5342
gem 'rake'
54-
gem 'sqlite3', '~> 1.6'
43+
gem 'sqlite3', '~> 2.0'
5544
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 5.2.0"
5+
gem "activerecord", "~> 7.1.0"
66
gem "rake"
7-
gem "sqlite3", "~> 1.4"
7+
gem "sqlite3", "~> 2.0"
88

99
group :local_development do
1010
gem "appraisal"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 6.0.0"
5+
gem "activerecord", "~> 7.2.0"
66
gem "rake"
7-
gem "sqlite3", "~> 1.4"
7+
gem "sqlite3", "~> 2.0"
88

99
group :local_development do
1010
gem "appraisal"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "https://rubygems.org"
44

5-
gem "activerecord", "~> 6.1.0"
5+
gem "activerecord", "~> 8.0.0"
66
gem "rake"
7-
gem "sqlite3", "~> 1.5"
7+
gem "sqlite3", "~> 2.0"
88

99
group :local_development do
1010
gem "appraisal"

gemfiles/rails_5.gemfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

gemfiles/rails_6_1.gemfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

gemfiles/rails_7_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 6.1.0"
5+
gem "rails", "~> 7.0.0"
66
gem "sqlite3", "~> 1.4"
77

88
group :local_development do
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 5.1.0"
6-
gem "sqlite3", "~> 1.4"
5+
gem "rails", "~> 7.1.0"
6+
gem "sqlite3", "~> 2.0"
77

88
group :local_development do
99
gem "appraisal"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 5.2.0"
6-
gem "sqlite3", "~> 1.4"
5+
gem "rails", "~> 7.2.0"
6+
gem "sqlite3", "~> 2.0"
77

88
group :local_development do
99
gem "appraisal"

0 commit comments

Comments
 (0)