diff options
author | Rémy Coutable <remy@rymai.me> | 2022-03-15 19:42:04 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2022-03-15 20:23:06 +0300 |
commit | f69b4e9fd337a8ce1e344c421d7497fc4f88f5b6 (patch) | |
tree | 7c7b47ffb38b7e3c2114c102853199c973311953 | |
parent | 79c1fc32e7e5a2b278e57c12873f4d2d4f29ca84 (diff) |
Use latest `gitlab-dangerfiles` features
Use features introduced in
https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/releases/v2.6.0
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | Dangerfile | 17 | ||||
-rw-r--r-- | danger/plugins/project_helper.rb | 22 |
2 files changed, 7 insertions, 32 deletions
diff --git a/Dangerfile b/Dangerfile index b938487f2..616556b1a 100644 --- a/Dangerfile +++ b/Dangerfile @@ -2,20 +2,17 @@ require 'gitlab-dangerfiles' -Gitlab::Dangerfiles.for_project(self) do |dangerfiles| - dangerfiles.import_defaults +Gitlab::Dangerfiles.for_project(self) do |gitlab_dangerfiles| + gitlab_dangerfiles.config.files_to_category = { + %r{\Adoc/.*(\.(md|png|gif|jpg))\z} => :docs, + %r{\A(CONTRIBUTING|LICENSE|README|REVIEWING|STYLE)(\.md)?\z} => :docs, - danger.import_plugin('danger/plugins/*.rb') + %r{.*} => [nil] + }.freeze Dir.each_child('danger/rules') do |rule| danger.import_dangerfile(path: "danger/rules/#{rule}") end - anything_to_post = status_report.values.any?(&:any?) - - if helper.ci? && anything_to_post - markdown("**If needed, you can retry the [`danger-review` job](#{ENV['CI_JOB_URL']}) that generated this comment.**") - end + gitlab_dangerfiles.import_defaults end - -# vim: ft=ruby diff --git a/danger/plugins/project_helper.rb b/danger/plugins/project_helper.rb deleted file mode 100644 index bb7036586..000000000 --- a/danger/plugins/project_helper.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -module Danger - # Common helper functions for danger scripts - class ProjectHelper < ::Danger::Plugin - # First-match win, so be sure to put more specific regex at the top... - CATEGORIES = { - %r{\Adoc/.*(\.(md|png|gif|jpg))\z} => :docs, - %r{\A(CONTRIBUTING|LICENSE|README|REVIEWING|STYLE)(\.md)?\z} => :docs, - - %r{.*} => [nil] - }.freeze - - def changes_by_category - helper.changes_by_category(CATEGORIES) - end - - def project_name - 'gitaly' - end - end -end |