From 2d907efb5640a5aed526cbf4abf527480bb220f0 Mon Sep 17 00:00:00 2001
From: Vasily Fedoseyev <vasilyfedoseyev@gmail.com>
Date: Tue, 22 Feb 2022 16:22:53 +0300
Subject: [PATCH] Do not install lint tools in all appraisals and remove
 unnecessary steps

---
 .github/workflows/test.yaml | 16 ++++------------
 Gemfile                     | 16 +++++++++-------
 gemfiles/rails_52.gemfile   | 17 ++++++++++-------
 gemfiles/rails_60.gemfile   | 17 ++++++++++-------
 gemfiles/rails_61.gemfile   | 17 ++++++++++-------
 gemfiles/rails_70.gemfile   | 17 ++++++++++-------
 6 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c6c1eb9..0794c13 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -27,14 +27,15 @@ jobs:
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile
+      BUNDLE_WITHOUT: lint
 
     services:
       postgres:
         image: postgres:12-alpine
         env:
+          POSTGRES_DB: paperclip_test
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: ""
-          POSTGRES_DB: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
         ports:
           - 5432:5432
@@ -46,16 +47,7 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
-      - name: Create databases
-        env:
-          RAILS_ENV: test
-          PGHOST: localhost
-          PGUSER: postgres
-          PGPORT: 5432
-        run: sudo -u postgres createdb -h localhost -p 5432 -U postgres paperclip_test
-
       - name: Run tests
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          bundle exec appraisal rails_${{ matrix.rails-version }} rake test
+          echo Running with $BUNDLE_GEMFILE
+          bundle exec rake test
diff --git a/Gemfile b/Gemfile
index 2ec4f9e..f67eb0c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,11 +24,13 @@ gem 'thoughtbot-shoulda', '>= 2.9.0'
 gem 'pry'
 gem 'pry-byebug'
 
-gem 'rubocop', '0.81.0'
-gem 'rubocop-rails', '2.5.2'
-gem 'rubocop-rspec', '1.38.1'
-gem 'rubocop-performance', '1.5.2'
+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
+  gem 'pronto', '>= 0.11', require: false
+  gem 'pronto-brakeman', require: false
+  gem 'pronto-rubocop', require: false
+end
diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile
index 9618ae7..4f2ef28 100644
--- a/gemfiles/rails_52.gemfile
+++ b/gemfiles/rails_52.gemfile
@@ -15,12 +15,15 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-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
+
+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: "../"
diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile
index 52675b0..fd95f96 100644
--- a/gemfiles/rails_60.gemfile
+++ b/gemfiles/rails_60.gemfile
@@ -15,12 +15,15 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-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
+
+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: "../"
diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile
index ea5d2fd..1a28344 100644
--- a/gemfiles/rails_61.gemfile
+++ b/gemfiles/rails_61.gemfile
@@ -15,12 +15,15 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-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
+
+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: "../"
diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile
index be93a51..adc7188 100644
--- a/gemfiles/rails_70.gemfile
+++ b/gemfiles/rails_70.gemfile
@@ -15,12 +15,15 @@ gem "mocha"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "pry"
 gem "pry-byebug"
-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
+
+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: "../"