Skip to content

Commit 6cd9c9d

Browse files
authored
Drop support for EOL Rails and Ruby version (#145)
* Drop support for Rails 4.2 and 5.1 Also use same versions of Rails 6.0, 5.2 and 5.1 as jsonapi-resources v0.10.7 uses: https://github.com/cerebris/jsonapi-resources/blob/v0.10.7/.github/workflows/ruby.yml * Drop support for Ruby 2.6 * Avoid defining version of bundler used for GitHub actions
1 parent 761545b commit 6cd9c9d

12 files changed

+13
-116
lines changed

.github/workflows/ruby.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,17 @@ jobs:
1919
strategy:
2020
matrix:
2121
gemfile:
22-
- rails_5_0_pundit_1
23-
- rails_5_0_pundit_2
24-
- rails_5_1_pundit_1
25-
- rails_5_1_pundit_2
2622
- rails_5_2_pundit_1
2723
- rails_5_2_pundit_2
2824
- rails_6_0_pundit_1
2925
- rails_6_0_pundit_2
30-
ruby-version: [ '2.5', '2.7' ]
31-
bundler-version: [ '1.11' ]
26+
ruby-version: [ '2.6', '2.7' ]
3227
include:
33-
# Include Rails 4.2 / Ruby 2.3 combo
34-
- gemfile: rails_4_2_pundit_1
35-
ruby-version: '2.3'
36-
bundler-version: '1.11'
37-
- gemfile: rails_4_2_pundit_2
38-
ruby-version: '2.3'
39-
bundler-version: '1.11'
4028
# Include Rails 6.0 / Ruby 3.0 combo
4129
- gemfile: rails_6_0_pundit_1
4230
ruby-version: '3.0'
43-
bundler-version: '2.1.4'
4431
- gemfile: rails_6_0_pundit_2
4532
ruby-version: '3.0'
46-
bundler-version: '2.1.4'
4733
continue-on-error: true
4834
env:
4935
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -54,7 +40,6 @@ jobs:
5440
# change this to (see https://github.com/ruby/setup-ruby#versioning):
5541
uses: ruby/setup-ruby@v1
5642
with:
57-
bundler: ${{ matrix.bundler-version }}
5843
ruby-version: ${{ matrix.ruby-version }}
5944
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
6045
- name: Run tests

Appraisals

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
1-
appraise 'rails-4-2 pundit-1' do
2-
gem 'rails', '4.2.0'
3-
gem 'jsonapi-resources', '~> 0.9.0'
4-
gem 'pundit', '~> 1.0'
5-
group :development, :test do
6-
gem 'sqlite3', '~> 1.3.13'
7-
end
8-
end
9-
10-
appraise 'rails-5-0 pundit-1' do
11-
gem 'rails', '5.0.0'
12-
gem 'jsonapi-resources', '~> 0.9.0'
13-
gem 'pundit', '~> 1.0'
14-
group :development, :test do
15-
gem 'sqlite3', '~> 1.3.13'
16-
end
17-
end
18-
191
appraise 'rails-5-1 pundit-1' do
20-
gem "rails", "5.1.0"
2+
gem "rails", "5.1.7"
213
gem 'jsonapi-resources', '~> 0.9.0'
224
gem 'pundit', '~> 1.0'
235
group :development, :test do
@@ -26,7 +8,7 @@ appraise 'rails-5-1 pundit-1' do
268
end
279

2810
appraise 'rails-5-2 pundit-1' do
29-
gem 'rails', '5.2.0'
11+
gem 'rails', '5.2.4.4'
3012
gem 'jsonapi-resources', '~> 0.9.0'
3113
gem 'pundit', '~> 1.0'
3214
group :development, :test do
@@ -35,34 +17,16 @@ appraise 'rails-5-2 pundit-1' do
3517
end
3618

3719
appraise 'rails-6-0 pundit-1' do
38-
gem 'rails', '~> 6.0.0'
20+
gem 'rails', '~> 6.0.3.4'
3921
gem 'jsonapi-resources', '~> 0.9.0'
4022
gem 'pundit', '~> 1.0'
4123
group :development, :test do
4224
gem 'sqlite3', '~> 1.4.1'
4325
end
4426
end
4527

46-
appraise 'rails-4-2 pundit-2' do
47-
gem 'rails', '4.2.0'
48-
gem 'jsonapi-resources', '~> 0.9.0'
49-
gem 'pundit', '~> 2.0'
50-
group :development, :test do
51-
gem 'sqlite3', '~> 1.3.13'
52-
end
53-
end
54-
55-
appraise 'rails-5-0 pundit-2' do
56-
gem 'rails', '5.0.0'
57-
gem 'jsonapi-resources', '~> 0.9.0'
58-
gem 'pundit', '~> 2.0'
59-
group :development, :test do
60-
gem 'sqlite3', '~> 1.3.13'
61-
end
62-
end
63-
6428
appraise 'rails-5-1 pundit-2' do
65-
gem 'rails', '5.1.0'
29+
gem 'rails', '5.1.7'
6630
gem 'jsonapi-resources', '~> 0.9.0'
6731
gem 'pundit', '~> 2.0'
6832
group :development, :test do
@@ -71,7 +35,7 @@ appraise 'rails-5-1 pundit-2' do
7135
end
7236

7337
appraise 'rails-5-2 pundit-2' do
74-
gem 'rails', '5.2.0'
38+
gem 'rails', '5.2.4.4'
7539
gem 'jsonapi-resources', '~> 0.9.0'
7640
gem 'pundit', '~> 2.0'
7741
group :development, :test do
@@ -80,7 +44,7 @@ appraise 'rails-5-2 pundit-2' do
8044
end
8145

8246
appraise 'rails-6-0 pundit-2' do
83-
gem 'rails', '~> 6.0.0'
47+
gem 'rails', '~> 6.0.3.4'
8448
gem 'jsonapi-resources', '~> 0.9.0'
8549
gem 'pundit', '~> 2.0'
8650
group :development, :test do

gemfiles/rails_4_2_pundit_1.gemfile

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

gemfiles/rails_4_2_pundit_2.gemfile

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

gemfiles/rails_5_0_pundit_1.gemfile

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

gemfiles/rails_5_0_pundit_2.gemfile

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

gemfiles/rails_5_1_pundit_1.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", "5.1.0"
5+
gem "rails", "5.1.7"
66
gem "jsonapi-resources", "~> 0.9.0"
77
gem "pundit", "~> 1.0"
88

gemfiles/rails_5_1_pundit_2.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", "5.1.0"
5+
gem "rails", "5.1.7"
66
gem "jsonapi-resources", "~> 0.9.0"
77
gem "pundit", "~> 2.0"
88

gemfiles/rails_5_2_pundit_1.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", "5.2.0"
5+
gem "rails", "5.2.4.4"
66
gem "jsonapi-resources", "~> 0.9.0"
77
gem "pundit", "~> 1.0"
88

gemfiles/rails_5_2_pundit_2.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", "5.2.0"
5+
gem "rails", "5.2.4.4"
66
gem "jsonapi-resources", "~> 0.9.0"
77
gem "pundit", "~> 2.0"
88

0 commit comments

Comments
 (0)