diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab7cfd9f9efc707aeedbc7be9b36db874ae3bbaf..6f0552c13243845d367d46c0102338c869bee50b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ cppcheck-misra: before_script: # install cppcheck from the sid repos in order to get the latest version - echo deb http://deb.debian.org/debian sid main > /etc/apt/sources.list - - apt-get update -qq && apt-get -t sid install -y -qq cppcheck + - apt-get update -qq && apt-get -t sid install -y -qq cppcheck && apt-get -t sid install -y python3.6 - cppcheck --version script: - ci/cppcheck-misra.sh diff --git a/ci/cppcheck-misra.sh b/ci/cppcheck-misra.sh index b4cadcc79c540651c3c4ed6f83c9c8bec740c10a..0500b2eee79ccd63fd1fbbcb6933f6ac319514b3 100755 --- a/ci/cppcheck-misra.sh +++ b/ci/cppcheck-misra.sh @@ -26,5 +26,4 @@ sed -i -r 's/(.*Script.*)|(.*Checking.*)|(.*MISRA.*)//gm; /(^$)/d; s/(\s\(.*\)\s # run the summarizer for a nice, clean summary of errors echo -e "\u001b[34;1mSummarizing results...\u001b[0m" -python3 --version -python3 ci/summarizer.py ci/report.msr +python3.6 ci/summarizer.py ci/report.msr diff --git a/ci/summarizer.py b/ci/summarizer.py index b2a6e8fc0c672a7d219d5993ee766f783800f11c..db0c04e6a4cd4618c8d0014e55541f175da3e5d6 100755 --- a/ci/summarizer.py +++ b/ci/summarizer.py @@ -61,7 +61,7 @@ class Summarizer(object): name_string = f"{self.bold}{self.red}File {self.yellow}{key}{self.red}" rule_violated_string = f"violates rule {self.yellow}#{error[1]}{self.red} of the MISRA C 2012 standard" line_number_string = f"at line {self.yellow}{error[0]}{self.end}" - + print(f"{name_string.ljust(75)} {rule_violated_string} {line_number_string}") print("")