From: Michał Kępień <michal@isc.org>
Date: Mon, 18 May 2020 08:23:06 +0000 (+0200)
Subject: Ensure cppcheck creates a HTML report upon failure
X-Git-Tag: v9.17.2~70^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb2037ee9d88351222b6f1c888aa35fe75036021;p=thirdparty%2Fbind9.git

Ensure cppcheck creates a HTML report upon failure

Commit ec72d1100d7e86c131ab1936f91ed4da87c48a4b broke the cppcheck job
in GitLab CI: when cppcheck fails, the script is immediately
interrupted, preventing cppcheck-htmlreport from being run.  To ensure
the HTML report is generated when cppcheck fails, revert to invoking
cppcheck-htmlreport in the "after_script" part of the job.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 120c5a91af9..3ac064de4e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -358,6 +358,7 @@ stages:
     - export GCC_VERSION=$(gcc --version | sed -n 's/.*\([0-9]\+\)\.[0-9]\+\.[0-9]\+.*/\1/p')
     - sed -i "/gcc\",/a\"-DCPPCHECK\", \"-D__STDC__\", \"-D__GNUC__=${GCC_VERSION}\"," compile_commands.json
     - *run_cppcheck
+  after_script:
     - *cppcheck_report_html
   artifacts:
     paths: