Use the correct exceptions to look for invalid YAML in Changelogs
This commit is contained in:
parent
924146a8d6
commit
9265e76920
|
@ -38,12 +38,14 @@ def check_changelog(path)
|
||||||
|
|
||||||
if yaml["merge_request"].nil?
|
if yaml["merge_request"].nil?
|
||||||
message "Consider setting `merge_request` to #{gitlab.mr_json["iid"]} in #{gitlab.html_link(path)}. #{SEE_DOC}"
|
message "Consider setting `merge_request` to #{gitlab.mr_json["iid"]} in #{gitlab.html_link(path)}. #{SEE_DOC}"
|
||||||
elsif yaml["merge_request"] != gitlab.mr_json["iid"] && !ce_port_changelog?(changelog_path)
|
elsif yaml["merge_request"] != gitlab.mr_json["iid"] && !ce_port_changelog?(path)
|
||||||
fail "Merge request ID was not set to #{gitlab.mr_json["iid"]}! #{SEE_DOC}"
|
fail "Merge request ID was not set to #{gitlab.mr_json["iid"]}! #{SEE_DOC}"
|
||||||
end
|
end
|
||||||
rescue StandardError
|
rescue Psych::SyntaxError, Psych::DisallowedClass, Psych::BadAlias
|
||||||
# YAML could not be parsed, fail the build.
|
# YAML could not be parsed, fail the build.
|
||||||
fail "#{gitlab.html_link(path)} isn't valid YAML! #{SEE_DOC}"
|
fail "#{gitlab.html_link(path)} isn't valid YAML! #{SEE_DOC}"
|
||||||
|
rescue StandardError => e
|
||||||
|
warn "There was a problem trying to check the Changelog. Exception: #{e.name} - #{e.message}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def presented_no_changelog_labels
|
def presented_no_changelog_labels
|
||||||
|
|
Loading…
Reference in New Issue