inherit styleguide from gem instead of from config file

this should make CI builds way more stable
Shopify · Aug 5, 2020 · ec8a50b · ec8a50b
1 parent c83363c
commit ec8a50b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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