diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 08:47:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 08:47:53 +0000 |
| commit | c70c20dddd26367724bbcf3f40912eb4d0b387b9 (patch) | |
| tree | b538f689a5fcbbe923126fc3b7ebd681e3c8a74c | |
| parent | e9f9c97196e620bc8f29c68d293dcc3be8a0ecce (diff) | |
| parent | 9265e7692033c8a38ade4e31281613e3fb299611 (diff) | |
| download | gitlab-ce-c70c20dddd26367724bbcf3f40912eb4d0b387b9.tar.gz | |
Merge branch 'fix-danger' into 'master'
Fix Danger checks for invalid Changelogs
See merge request gitlab-org/gitlab-ce!20603
| -rw-r--r-- | danger/changelog/Dangerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile index 2424e650d07..0374de24520 100644 --- a/danger/changelog/Dangerfile +++ b/danger/changelog/Dangerfile @@ -38,12 +38,14 @@ def check_changelog(path) if yaml["merge_request"].nil? 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}" end -rescue StandardError +rescue Psych::SyntaxError, Psych::DisallowedClass, Psych::BadAlias # YAML could not be parsed, fail the build. 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 def presented_no_changelog_labels |