diff options
Diffstat (limited to 'tooling/danger/project_helper.rb')
-rw-r--r-- | tooling/danger/project_helper.rb | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index 5d338393f90..b49df50c5f0 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -5,6 +5,7 @@ module Tooling module ProjectHelper LOCAL_RULES ||= %w[ changelog + ci_config database documentation duplicate_yarn_dependencies @@ -127,7 +128,7 @@ module Tooling %r{\A((spec/)?lib/generators/gitlab/usage_metric_)} => [:product_intelligence], %r{\A((ee|jh)/)?lib/gitlab/usage_data_counters/.*\.yml\z} => [:product_intelligence], - %r{\A((ee|jh)/)?config/metrics/((.*\.yml)|(schema\.json))\z} => [:product_intelligence], + %r{\A((ee|jh)/)?config/(events|metrics)/((.*\.yml)|(schema\.json))\z} => [:product_intelligence], %r{\A((ee|jh)/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :product_intelligence], %r{\A( lib/gitlab/tracking\.rb | @@ -151,7 +152,8 @@ module Tooling %r{\A((ee|jh)/)?vendor/} => :backend, %r{\A(Gemfile|Gemfile.lock|Rakefile)\z} => :backend, %r{\A[A-Z_]+_VERSION\z} => :backend, - %r{\A\.rubocop((_manual)?_todo)?\.yml\z} => :backend, + %r{\A\.rubocop(_todo)?\.yml\z} => :backend, + %r{\A\.rubocop_todo/.*\.yml\z} => :backend, %r{\Afile_hooks/} => :backend, %r{\A((ee|jh)/)?qa/} => :qa, @@ -174,18 +176,6 @@ module Tooling %r{\.js\z} => :frontend }.freeze - def changes_by_category - helper.changes_by_category(CATEGORIES) - end - - def changes - helper.changes(CATEGORIES) - end - - def categories_for_file(file) - helper.categories_for_file(file, CATEGORIES) - end - def local_warning_message "#{MESSAGE_PREFIX} Only the following Danger rules can be run locally: #{LOCAL_RULES.join(', ')}" end @@ -201,11 +191,7 @@ module Tooling end def all_ee_changes - changes.files.grep(%r{\Aee/}) - end - - def project_name - ee? ? 'gitlab' : 'gitlab-foss' + helper.changes.files.grep(%r{\Aee/}) end def file_lines(filename) @@ -221,11 +207,6 @@ module Tooling def read_file(filename) File.read(filename) end - - def ee? - # Support former project name for `dev` and support local Danger run - %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) || Dir.exist?(File.expand_path('../../ee', __dir__)) - end end end end |