diff --git a/Gemfile b/Gemfile index c14418ba7e395c0e7a7893f0f3f7ee961fb0337b..2e2227d98753c48df07aad0ca42cf770daadf09f 100644 --- a/Gemfile +++ b/Gemfile @@ -394,7 +394,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.2.2', require: false + gem 'gitlab-dangerfiles', '~> 2.3.0', require: false end group :development, :test, :coverage do diff --git a/Gemfile.lock b/Gemfile.lock index 617e1f18caaba7c2d2a47ef0c5cb623f57e4180b..7cd04312b948e9873b0886d76467230cf605003e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,7 +460,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.2.2) + gitlab-dangerfiles (2.3.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) gitlab-experiment (0.6.2) @@ -1467,7 +1467,7 @@ DEPENDENCIES gitaly (~> 14.1.0.pre.rc4) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.2.2) + gitlab-dangerfiles (~> 2.3.0) gitlab-experiment (~> 0.6.2) gitlab-fog-azure-rm (~> 1.1.1) gitlab-labkit (~> 0.21.0) diff --git a/danger/specialization_labels/Dangerfile b/danger/specialization_labels/Dangerfile index 35125f20b146cf03f0d80f8a28153e215d4836c3..e86d66f5fbc9d849ab5fb0633d2c9784ad223ee5 100644 --- a/danger/specialization_labels/Dangerfile +++ b/danger/specialization_labels/Dangerfile @@ -8,7 +8,7 @@ SPECIALIZATIONS = { frontend: 'frontend', docs: 'documentation', qa: 'QA', - engineering_productivity: 'Engineering Productivity', + tooling: 'tooling', ci_template: 'ci::templates', feature_flag: 'feature flag' }.freeze diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index 8bcfac5a6995ebbf11b2c9298dd34190db62758d..1d95fd1fd6bef27ad5aa4803a9d070dd760e98d1 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -77,7 +77,7 @@ 'ee/spec/frontend/bar' | [:frontend] 'ee/spec/frontend_integration/bar' | [:frontend] - '.gitlab/ci/frontend.gitlab-ci.yml' | %i[frontend engineering_productivity] + '.gitlab/ci/frontend.gitlab-ci.yml' | %i[frontend tooling] 'app/models/foo' | [:backend] 'bin/foo' | [:backend] @@ -113,22 +113,22 @@ 'Rakefile' | [:backend] 'FOO_VERSION' | [:backend] - 'Dangerfile' | [:engineering_productivity] - 'danger/bundle_size/Dangerfile' | [:engineering_productivity] - 'ee/danger/bundle_size/Dangerfile' | [:engineering_productivity] - 'danger/bundle_size/' | [:engineering_productivity] - 'ee/danger/bundle_size/' | [:engineering_productivity] - '.gitlab-ci.yml' | [:engineering_productivity] - '.gitlab/ci/cng.gitlab-ci.yml' | [:engineering_productivity] - '.gitlab/ci/ee-specific-checks.gitlab-ci.yml' | [:engineering_productivity] - 'scripts/foo' | [:engineering_productivity] - 'tooling/danger/foo' | [:engineering_productivity] - 'ee/tooling/danger/foo' | [:engineering_productivity] - 'lefthook.yml' | [:engineering_productivity] - '.editorconfig' | [:engineering_productivity] - 'tooling/bin/find_foss_tests' | [:engineering_productivity] - '.codeclimate.yml' | [:engineering_productivity] - '.gitlab/CODEOWNERS' | [:engineering_productivity] + 'Dangerfile' | [:tooling] + 'danger/bundle_size/Dangerfile' | [:tooling] + 'ee/danger/bundle_size/Dangerfile' | [:tooling] + 'danger/bundle_size/' | [:tooling] + 'ee/danger/bundle_size/' | [:tooling] + '.gitlab-ci.yml' | [:tooling] + '.gitlab/ci/cng.gitlab-ci.yml' | [:tooling] + '.gitlab/ci/ee-specific-checks.gitlab-ci.yml' | [:tooling] + 'scripts/foo' | [:tooling] + 'tooling/danger/foo' | [:tooling] + 'ee/tooling/danger/foo' | [:tooling] + 'lefthook.yml' | [:tooling] + '.editorconfig' | [:tooling] + 'tooling/bin/find_foss_tests' | [:tooling] + '.codeclimate.yml' | [:tooling] + '.gitlab/CODEOWNERS' | [:tooling] 'lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml' | [:ci_template] 'lib/gitlab/ci/templates/dotNET-Core.yml' | [:ci_template] diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index 8151e0740969e1179f9f9195c1a020fba2444a3d..4bcc398fa52541387758d2d2e82f388e8c5d8358 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -74,7 +74,7 @@ module ProjectHelper %r{(\A|/)( \.gitlab/ci/frontend\.gitlab-ci\.yml - )\z}x => %i[frontend engineering_productivity], + )\z}x => %i[frontend tooling], %r{\A(ee/)?db/(geo/)?(migrate|post_migrate)/} => [:database, :migration], %r{\A(ee/)?db/(?!fixtures)[^/]+} => [:database], @@ -84,16 +84,16 @@ module ProjectHelper %r{\A(ee/)?app/finders/} => [:database, :backend], %r{\Arubocop/cop/migration(/|\.rb)} => :database, - %r{\A(\.gitlab-ci\.yml\z|\.gitlab\/ci)} => :engineering_productivity, - %r{\A\.codeclimate\.yml\z} => :engineering_productivity, - %r{\Alefthook.yml\z} => :engineering_productivity, - %r{\A\.editorconfig\z} => :engineering_productivity, - %r{Dangerfile\z} => :engineering_productivity, - %r{\A(ee/)?(danger/|tooling/danger/)} => :engineering_productivity, - %r{\A(ee/)?scripts/} => :engineering_productivity, - %r{\Atooling/} => :engineering_productivity, - %r{(CODEOWNERS)} => :engineering_productivity, - %r{(tests.yml)} => :engineering_productivity, + %r{\A(\.gitlab-ci\.yml\z|\.gitlab\/ci)} => :tooling, + %r{\A\.codeclimate\.yml\z} => :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{\Atooling/} => :tooling, + %r{(CODEOWNERS)} => :tooling, + %r{(tests.yml)} => :tooling, %r{\Alib/gitlab/ci/templates} => :ci_template,