Update gems and CI, drop CI support for rails 5.2 and ruby 2.6

.github/workflows/pronto.yaml

@@ -4,15 +4,17 @@ jobs:
   lint:
     name: Pronto lint
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: lint
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
       - name: Install ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '3.2'
           bundler-cache: true
-      - run: bundle exec pronto run -f github_status github_pr_review -c origin/master
+      - run: bundle exec pronto run -f text github_status github_pr_review -c origin/master
         env:
           PRONTO_GITHUB_ACCESS_TOKEN: ${{ github.token }}
           PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}

.github/workflows/test.yaml

@@ -1,5 +1,7 @@
 name: Test
-on: [push]
+on:
+  - push
+  - pull_request
 jobs:
   runTests:
     runs-on: ubuntu-latest
@@ -7,22 +9,12 @@ jobs:
     strategy:
       matrix:
         include:
-          # EKAM
+          - ruby-version: 2.7.8
-          - ruby-version: 2.5.8
-            rails-version: 52
-          # InSales
-          - ruby-version: 2.6.6
-            rails-version: 52
-          - ruby-version: 2.6.6
             rails-version: 60
-          - ruby-version: 2.7.5
+          - ruby-version: 2.7.8
-            rails-version: 60
-          - ruby-version: 2.7.5
             rails-version: 61
-          - ruby-version: 2.7.5
-            rails-version: 70
           # EDGE
-          - ruby-version: 3.1.0
+          - ruby-version: 3.2.2
             rails-version: 70
 
     env:

.rubocop.yml

@@ -7,5 +7,5 @@ inherit_from:
   - https://raw.githubusercontent.com/insales/code_style/master/ruby/rubocop_rails.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.0

Appraisals

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-appraise 'rails_52' do
-  gem 'rails', '~> 5.2.6'
-end
-
 appraise 'rails_60' do
-  gem 'rails', '~> 6.0.4.4'
+  gem 'rails', '~>6.0.4'
 end
 
 appraise 'rails_61' do
-  gem 'rails', '~>6.1.4.4'
+  gem 'rails', '~>6.1.4'
 end
 
 appraise 'rails_70' do

Gemfile

@@ -5,10 +5,8 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gemspec
 
-gem 'appraisal'
-
 gem 'fastimage'
-gem 'pg', '~> 1.1.4'
+gem 'pg'
 
 gem 'aws-sdk-s3'
 gem 'fog-local'
@@ -26,13 +24,17 @@ gem 'pry-byebug'
 
 gem 'addressable'
 
-group :lint do
+unless defined?(Appraisal)
-  gem 'rubocop', '0.81.0'
+  gem 'appraisal'
-  gem 'rubocop-rails', '2.5.2'
-  gem 'rubocop-rspec', '1.38.1'
-  gem 'rubocop-performance', '1.5.2'
 
-  gem 'pronto', '>= 0.11', require: false
+  group :lint do
-  gem 'pronto-brakeman', require: false
+    gem 'rubocop', '~>0.81'
-  gem 'pronto-rubocop', require: false
+    gem 'rubocop-rails'
+    gem 'rubocop-rspec'
+    gem 'rubocop-performance'
+
+    gem 'pronto', '>= 0.11', require: false
+    gem 'pronto-brakeman', require: false
+    gem 'pronto-rubocop', require: false
+  end
 end

gemfiles/rails_52.gemfile

@@ -1,30 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "fastimage"
-gem "pg", "~> 1.1.4"
-gem "aws-sdk-s3"
-gem "fog-local"
-gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git"
-gem "rails", "~> 5.2.6"
-gem "sidekiq"
-gem "test-unit"
-gem "mocha"
-gem "thoughtbot-shoulda", ">= 2.9.0"
-gem "pry"
-gem "pry-byebug"
-gem "addressable"
-
-group :lint do
-  gem "rubocop", "0.81.0"
-  gem "rubocop-rails", "2.5.2"
-  gem "rubocop-rspec", "1.38.1"
-  gem "rubocop-performance", "1.5.2"
-  gem "pronto", ">= 0.11", require: false
-  gem "pronto-brakeman", require: false
-  gem "pronto-rubocop", require: false
-end
-
-gemspec path: "../"

gemfiles/rails_60.gemfile

@@ -2,13 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
 gem "fastimage"
-gem "pg", "~> 1.1.4"
+gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
 gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git"
-gem "rails", "~> 6.0.4.4"
+gem "rails", "~>6.0.4"
 gem "sidekiq"
 gem "test-unit"
 gem "mocha"
@@ -17,14 +16,4 @@ gem "pry"
 gem "pry-byebug"
 gem "addressable"
 
-group :lint do
-  gem "rubocop", "0.81.0"
-  gem "rubocop-rails", "2.5.2"
-  gem "rubocop-rspec", "1.38.1"
-  gem "rubocop-performance", "1.5.2"
-  gem "pronto", ">= 0.11", require: false
-  gem "pronto-brakeman", require: false
-  gem "pronto-rubocop", require: false
-end
-
 gemspec path: "../"

gemfiles/rails_61.gemfile

@@ -2,13 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
 gem "fastimage"
-gem "pg", "~> 1.1.4"
+gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
 gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git"
-gem "rails", "~>6.1.4.4"
+gem "rails", "~>6.1.4"
 gem "sidekiq"
 gem "test-unit"
 gem "mocha"
@@ -17,14 +16,4 @@ gem "pry"
 gem "pry-byebug"
 gem "addressable"
 
-group :lint do
-  gem "rubocop", "0.81.0"
-  gem "rubocop-rails", "2.5.2"
-  gem "rubocop-rspec", "1.38.1"
-  gem "rubocop-performance", "1.5.2"
-  gem "pronto", ">= 0.11", require: false
-  gem "pronto-brakeman", require: false
-  gem "pronto-rubocop", require: false
-end
-
 gemspec path: "../"

gemfiles/rails_70.gemfile

@@ -2,9 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
 gem "fastimage"
-gem "pg", "~> 1.1.4"
+gem "pg"
 gem "aws-sdk-s3"
 gem "fog-local"
 gem "delayed_paperclip", git: "https://github.com/insales/delayed_paperclip.git"
@@ -17,14 +16,4 @@ gem "pry"
 gem "pry-byebug"
 gem "addressable"
 
-group :lint do
-  gem "rubocop", "0.81.0"
-  gem "rubocop-rails", "2.5.2"
-  gem "rubocop-rspec", "1.38.1"
-  gem "rubocop-performance", "1.5.2"
-  gem "pronto", ">= 0.11", require: false
-  gem "pronto-brakeman", require: false
-  gem "pronto-rubocop", require: false
-end
-
 gemspec path: "../"