From 94c919da12cd1bf6c24a4bc2a5fbf2680711a633 Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <grigpavl@ece.auth.gr>
Date: Sat, 23 Mar 2019 16:08:54 +0200
Subject: [PATCH] Upgrade python to 3.6 in order for f-strings to work
Attempt #2 at fixing gitlab
Attempt at fixing gitlab build #3: damn symlinks
---
.gitlab-ci.yml | 2 +-
ci/cppcheck-misra.sh | 3 +--
ci/summarizer.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab7cfd9f..6f0552c1 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 b4cadcc7..0500b2ee 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 b2a6e8fc..db0c04e6 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("")
--
GitLab