From ec8a50b0824d481842134736cd63708a7da3df6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 5 Aug 2020 15:44:05 -0400 Subject: [PATCH] inherit styleguide from gem instead of from config file this should make CI builds way more stable --- .rubocop.yml | 4 ++-- Gemfile.lock | 3 +++ erb_lint.gemspec | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0d0203d0..a01e8665 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ -inherit_from: - - https://shopify.github.io/ruby-style-guide/rubocop.yml +inherit_gem: + rubocop-shopify: rubocop.yml AllCops: TargetRubyVersion: 2.5 diff --git a/Gemfile.lock b/Gemfile.lock index b74f8066..f812f589 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,6 +80,8 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) + rubocop-shopify (1.0.0) + rubocop (>= 0.78.0) ruby-progressbar (1.10.1) smart_properties (1.15.0) thread_safe (0.3.6) @@ -97,6 +99,7 @@ DEPENDENCIES rake rspec rubocop + rubocop-shopify BUNDLED WITH 1.17.3 diff --git a/erb_lint.gemspec b/erb_lint.gemspec index 23b28c39..fce7a04f 100644 --- a/erb_lint.gemspec +++ b/erb_lint.gemspec @@ -34,4 +34,5 @@ Gem::Specification.new do |s| s.add_development_dependency('rspec') s.add_development_dependency('rubocop') + s.add_development_dependency('rubocop-shopify') end