Commit d03b31ee authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'use-ci-default-branch-in-metadata-danger-rule' into 'master'

Use the $CI_DEFAULT_BRANCH variable in the metadata Danger rule

See merge request gitlab-org/gitlab!83773
parents 6de69f75 fc1b5e7b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# rubocop:disable Style/SignalException # rubocop:disable Style/SignalException
DEFAULT_BRANCH = 'master' default_branch = ENV['CI_DEFAULT_BRANCH'] || 'main'
if gitlab.mr_body.size < 5 if gitlab.mr_body.size < 5
fail "Please provide a proper merge request description." fail "Please provide a proper merge request description."
...@@ -14,12 +14,12 @@ end ...@@ -14,12 +14,12 @@ end
has_milestone = !gitlab.mr_json["milestone"].nil? has_milestone = !gitlab.mr_json["milestone"].nil?
unless has_milestone || (helper.security_mr? && helper.mr_target_branch == DEFAULT_BRANCH) unless has_milestone || (helper.security_mr? && helper.mr_target_branch == default_branch)
warn "This merge request does not refer to an existing milestone.", sticky: false warn "This merge request does not refer to an existing milestone.", sticky: false
end end
has_pick_into_stable_label = helper.mr_labels.find { |label| label.start_with?('Pick into') } has_pick_into_stable_label = helper.mr_labels.find { |label| label.start_with?('Pick into') }
if helper.mr_target_branch != DEFAULT_BRANCH && !has_pick_into_stable_label && !helper.security_mr? if helper.mr_target_branch != default_branch && !has_pick_into_stable_label && !helper.security_mr?
warn "Most of the time, merge requests should target `#{DEFAULT_BRANCH}`. Otherwise, please set the relevant `Pick into X.Y` label." warn "Most of the time, merge requests should target `#{default_branch}`. Otherwise, please set the relevant `Pick into X.Y` label."
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment