From 50f6014037955e2d5cab375f768997039af5e51e Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sun, 25 Apr 2021 11:27:26 +0200 Subject: [PATCH] Improve Travis CI tests Ref: rubocop/rubocop#9648 --- .travis.yml | 7 +++++++ Gemfile | 6 ++++++ gemfiles/rails_5.0.gemfile | 5 +++++ gemfiles/rails_5.1.gemfile | 5 +++++ gemfiles/rails_5.2.gemfile | 5 +++++ gemfiles/rails_6.0.gemfile | 5 +++++ gemfiles/rails_6.1.gemfile | 5 +++++ gemfiles/rails_edge.gemfile | 5 +++++ route_translator.gemspec | 5 ----- 9 files changed, 43 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23ad03aa..d8644a4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,11 @@ jobs: allow_failures: - rvm: ruby-head - gemfile: gemfiles/rails_edge.gemfile + include: + - rvm: 2.4.10 + gemfile: Gemfile + script: bundle exec rake rubocop + name: RuboCop exclude: - rvm: 2.4.10 gemfile: gemfiles/rails_edge.gemfile @@ -50,3 +55,5 @@ jobs: - rvm: ruby-head gemfile: gemfiles/rails_5.2.gemfile fast_finish: true + +script: bundle exec rake test diff --git a/Gemfile b/Gemfile index 7f4f5e95..77418490 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,9 @@ source 'https://rubygems.org' gemspec + +gem 'rubocop', '~> 1.12.1' +gem 'rubocop-minitest', '~> 0.11.1' +gem 'rubocop-performance', '~> 1.10.2' +gem 'rubocop-rails', '~> 2.9' +gem 'rubocop-rake', '~> 0.5.1' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 10f52e7a..b3e3c8b6 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.0.0" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 6100e830..a387abd3 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.1.0" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 5a706dcb..de8caeda 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 5.2.0" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 15b9b275..50ac511e 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 6.0.0" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 7e95520a..8b638dd6 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", "~> 6.1.0.rc1" gemspec path: "../" diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index 5d00b316..bdfe5559 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "rubocop", "~> 1.12.1" +gem "rubocop-minitest", "~> 0.11.1" +gem "rubocop-performance", "~> 1.10.2" +gem "rubocop-rails", "~> 2.9" +gem "rubocop-rake", "~> 0.5.1" gem "rails", git: "https://github.com/rails/rails.git", branch: "main" gemspec path: "../" diff --git a/route_translator.gemspec b/route_translator.gemspec index f88c97bf..63e199e2 100644 --- a/route_translator.gemspec +++ b/route_translator.gemspec @@ -34,10 +34,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.14' spec.add_development_dependency 'rails', '>= 5.0.0.1', '< 6.2' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.12' - spec.add_development_dependency 'rubocop-minitest', '~> 0.11.1' - spec.add_development_dependency 'rubocop-performance', '~> 1.10' - spec.add_development_dependency 'rubocop-rails', '~> 2.9' - spec.add_development_dependency 'rubocop-rake', '~> 0.5.1' spec.add_development_dependency 'simplecov', '>= 0.18.5', '< 0.22' end