diff options
Diffstat (limited to 'tooling/danger')
-rw-r--r-- | tooling/danger/product_intelligence.rb | 2 | ||||
-rw-r--r-- | tooling/danger/project_helper.rb | 51 |
2 files changed, 26 insertions, 27 deletions
diff --git a/tooling/danger/product_intelligence.rb b/tooling/danger/product_intelligence.rb index 9eab611ec68..30c961184f5 100644 --- a/tooling/danger/product_intelligence.rb +++ b/tooling/danger/product_intelligence.rb @@ -70,7 +70,7 @@ module Tooling 'data-track-action' ) all_changed_files.select do |file| - matching_files?(file, extension: '.rb', pattern: %r{Gitlab::Tracking\.(event|enabled\?|snowplow_options)$}) || + matching_files?(file, extension: '.rb', pattern: %r{Gitlab::Tracking\.(event|enabled\?|options)$}) || matching_files?(file, extension: '.js', pattern: js_patterns) || matching_files?(file, extension: '.vue', pattern: js_patterns) || matching_files?(file, extension: '.haml', pattern: %r{data: \{ track}) diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index 07daf249023..109f77ed4d1 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -10,7 +10,6 @@ module Tooling duplicate_yarn_dependencies eslint gitaly - karma pajamas pipeline prettier @@ -37,7 +36,7 @@ module Tooling CATEGORIES = { [%r{usage_data\.rb}, %r{^(\+|-).*\s+(count|distinct_count|estimate_batch_distinct_count)\(.*\)(.*)$}] => [:database, :backend, :product_intelligence], - %r{\A(ee/)?config/feature_flags/} => :feature_flag, + %r{\A((ee|jh)/)?config/feature_flags/} => :feature_flag, %r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs, %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs, @@ -48,11 +47,11 @@ module Tooling spec/frontend/tracking/.*\.js | spec/frontend/tracking_spec\.js )\z}x => [:frontend, :product_intelligence], - %r{\A(ee/)?app/(assets|views)/} => :frontend, - %r{\A(ee/)?public/} => :frontend, - %r{\A(ee/)?spec/(javascripts|frontend|frontend_integration)/} => :frontend, - %r{\A(ee/)?vendor/assets/} => :frontend, - %r{\A(ee/)?scripts/frontend/} => :frontend, + %r{\A((ee|jh)/)?app/(assets|views)/} => :frontend, + %r{\A((ee|jh)/)?public/} => :frontend, + %r{\A((ee|jh)/)?spec/(javascripts|frontend|frontend_integration)/} => :frontend, + %r{\A((ee|jh)/)?vendor/assets/} => :frontend, + %r{\A((ee|jh)/)?scripts/frontend/} => :frontend, %r{(\A|/)( \.babelrc | \.browserslistrc | @@ -75,12 +74,12 @@ module Tooling \.gitlab/ci/frontend\.gitlab-ci\.yml )\z}x => %i[frontend tooling], - %r{\A(ee/)?db/(geo/)?(migrate|post_migrate)/} => [:database, :migration], - %r{\A(ee/)?db/(?!fixtures)[^/]+} => [:database], - %r{\A(ee/)?lib/gitlab/(database|background_migration|sql|github_import)(/|\.rb)} => [:database, :backend], + %r{\A((ee|jh)/)?db/(geo/)?(migrate|post_migrate)/} => [:database, :migration], + %r{\A((ee|jh)/)?db/(?!fixtures)[^/]+} => [:database], + %r{\A((ee|jh)/)?lib/gitlab/(database|background_migration|sql|github_import)(/|\.rb)} => [:database, :backend], %r{\A(app/services/authorized_project_update/find_records_due_for_refresh_service)(/|\.rb)} => [:database, :backend], %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => [:database, :backend], - %r{\A(ee/)?app/finders/} => [:database, :backend], + %r{\A((ee|jh)/)?app/finders/} => [:database, :backend], %r{\Arubocop/cop/migration(/|\.rb)} => :database, %r{\A(\.gitlab-ci\.yml\z|\.gitlab\/ci)} => :tooling, @@ -88,22 +87,22 @@ module Tooling %r{\Alefthook.yml\z} => :tooling, %r{\A\.editorconfig\z} => :tooling, %r{Dangerfile\z} => :tooling, - %r{\A(ee/)?(danger/|tooling/danger/)} => :tooling, - %r{\A(ee/)?scripts/} => :tooling, + %r{\A((ee|jh)/)?(danger/|tooling/danger/)} => :tooling, + %r{\A((ee|jh)/)?scripts/} => :tooling, %r{\Atooling/} => :tooling, %r{(CODEOWNERS)} => :tooling, %r{(tests.yml)} => :tooling, %r{\Alib/gitlab/ci/templates} => :ci_template, - %r{\A(ee/)?spec/features/} => :test, - %r{\A(ee/)?spec/support/shared_examples/features/} => :test, - %r{\A(ee/)?spec/support/shared_contexts/features/} => :test, - %r{\A(ee/)?spec/support/helpers/features/} => :test, + %r{\A((ee|jh)/)?spec/features/} => :test, + %r{\A((ee|jh)/)?spec/support/shared_examples/features/} => :test, + %r{\A((ee|jh)/)?spec/support/shared_contexts/features/} => :test, + %r{\A((ee|jh)/)?spec/support/helpers/features/} => :test, - %r{\A(ee/)?lib/gitlab/usage_data_counters/.*\.yml\z} => [:product_intelligence], - %r{\A(ee/)?config/metrics/((.*\.yml)|(schema\.json))\z} => [:product_intelligence], - %r{\A(ee/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :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)/)?lib/gitlab/usage_data(_counters)?(/|\.rb)} => [:backend, :product_intelligence], %r{\A( lib/gitlab/tracking\.rb | spec/lib/gitlab/tracking_spec\.rb | @@ -112,21 +111,21 @@ module Tooling lib/generators/rails/usage_metric_definition_generator\.rb | spec/lib/generators/usage_metric_definition_generator_spec\.rb | generator_templates/usage_metric_definition/metric_definition\.yml)\z}x => [:backend, :product_intelligence], - %r{\A(ee/)?app/(?!assets|views)[^/]+} => :backend, - %r{\A(ee/)?(bin|config|generator_templates|lib|rubocop)/} => :backend, - %r{\A(ee/)?spec/} => :backend, - %r{\A(ee/)?vendor/} => :backend, + %r{\A((ee|jh)/)?app/(?!assets|views)[^/]+} => :backend, + %r{\A((ee|jh)/)?(bin|config|generator_templates|lib|rubocop)/} => :backend, + %r{\A((ee|jh)/)?spec/} => :backend, + %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{\Afile_hooks/} => :backend, - %r{\A(ee/)?qa/} => :qa, + %r{\A((ee|jh)/)?qa/} => :qa, %r{\Aworkhorse/.*} => :workhorse, # Files that don't fit into any category are marked with :none - %r{\A(ee/)?changelogs/} => :none, + %r{\A((ee|jh)/)?changelogs/} => :none, %r{\Alocale/gitlab\.pot\z} => :none, # GraphQL auto generated doc files and schema |