diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-26 21:08:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-26 21:08:08 +0300 |
| commit | f056b7d1315536ca3380358159681ad25067c33e (patch) | |
| tree | 2e2b488ee18a35ff6c43bc10ba7f3f8dd944f8e5 /scripts | |
| parent | 2f9a321178354f6934452a5b6e42d50b997adf21 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/utils.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/utils.sh b/scripts/utils.sh index 2bbe7e10de8..151b58f0db2 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -126,15 +126,22 @@ function fail_on_warnings() { # Turn grep errors into warnings so we fail later. warnings=$(grep --invert-match --file "$allowed_warning_file" "$warning_file" 2>&1 || true) - rm -f "$warning_file" "$allowed_warning_file" + rm -f "$allowed_warning_file" if [ "$warnings" != "" ] then echoerr "There were warnings:" - echoerr "$warnings" + echoerr "======================== Filtered warnings =====================================" + echo "$warnings" + echoerr "======================= Unfiltered warnings ====================================" + cat "$warning_file" + echoerr "================================================================================" + rm -f "$warning_file" return 1 fi + rm -f "$warning_file" + return $ret } |