From 9503599088a7f3eaaa763a3dd7e72c3dcd9137cb Mon Sep 17 00:00:00 2001 From: Vasily Fedoseyev Date: Thu, 1 Jun 2023 18:29:47 +0300 Subject: [PATCH] Update gems and CI, drop CI support for rails 5.2 and ruby 2.6 --- .github/workflows/pronto.yaml | 6 ++++-- .github/workflows/test.yaml | 20 ++++++-------------- .rubocop.yml | 4 ++-- Appraisals | 8 ++------ Gemfile | 24 +++++++++++++----------- gemfiles/rails_52.gemfile | 30 ------------------------------ gemfiles/rails_60.gemfile | 15 ++------------- gemfiles/rails_61.gemfile | 15 ++------------- gemfiles/rails_70.gemfile | 13 +------------ 9 files changed, 32 insertions(+), 103 deletions(-) delete mode 100644 gemfiles/rails_52.gemfile diff --git a/.github/workflows/pronto.yaml b/.github/workflows/pronto.yaml index 0109363..86e658c 100644 --- a/.github/workflows/pronto.yaml +++ b/.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 }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0794c13..74138e2 100644 --- a/.github/workflows/test.yaml +++ b/.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.5.8 - rails-version: 52 - # InSales - - ruby-version: 2.6.6 - rails-version: 52 - - ruby-version: 2.6.6 + - ruby-version: 2.7.8 rails-version: 60 - - ruby-version: 2.7.5 - rails-version: 60 - - ruby-version: 2.7.5 + - ruby-version: 2.7.8 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: diff --git a/.rubocop.yml b/.rubocop.yml index 9bbdd19..d9a5731 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,5 +7,5 @@ inherit_from: - https://raw.githubusercontent.com/insales/code_style/master/ruby/rubocop_rails.yml AllCops: - TargetRubyVersion: 2.6 - TargetRailsVersion: 5.2 + TargetRubyVersion: 2.7 + TargetRailsVersion: 6.0 diff --git a/Appraisals b/Appraisals index a5d8475..c0b3d04 100644 --- a/Appraisals +++ b/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 diff --git a/Gemfile b/Gemfile index 4c08290..b09e37d 100644 --- a/Gemfile +++ b/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 - gem 'rubocop', '0.81.0' - gem 'rubocop-rails', '2.5.2' - gem 'rubocop-rspec', '1.38.1' - gem 'rubocop-performance', '1.5.2' +unless defined?(Appraisal) + gem 'appraisal' - gem 'pronto', '>= 0.11', require: false - gem 'pronto-brakeman', require: false - gem 'pronto-rubocop', require: false + group :lint do + gem 'rubocop', '~>0.81' + 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 diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile deleted file mode 100644 index c1e278e..0000000 --- a/gemfiles/rails_52.gemfile +++ /dev/null @@ -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: "../" diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index 7f744cd..7483901 100644 --- a/gemfiles/rails_60.gemfile +++ b/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: "../" diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index c40e2b6..0c0d359 100644 --- a/gemfiles/rails_61.gemfile +++ b/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: "../" diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index c1e4784..43d836e 100644 --- a/gemfiles/rails_70.gemfile +++ b/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: "../"