diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3745a0e..e662a0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,18 +49,21 @@ static_analysis:
     - apt install -qy python-pip
     - pip install -U platformio
     - pio init --ide atom
+    - pip install cppcheck-junit
     - mkdir -p build
   script:
 #    - cppcheck --enable=all --check-config src
     - cppcheck --error-exitcode=1 src 2>&1 | tee build/cppcheck-err.txt
+    - cppcheck --xml src 2> build/cppcheck-result.xml
+    - cppcheck_junit build/cppcheck-result.xml build/cppcheck-junit.xml
     - script/build_compile_commands.py
-    - run-clang-tidy -fix -export-fixes=build/clang-tidy-fixes.yml src
+    - run-clang-tidy -fix -export-fixes=build/clang-tidy-fixes.yml src || true
     - cat "build/clang-tidy-fixes.yml" | scripts/clang-tidy-to-junit.py src >"build/clang-tidy-junit.xml"
   artifacts:
     reports:
       junit:
         - clang-tidy-junit.xml
-#        - cppcheck-err.txt
+        - cppcheck-junit.xml
 
 deploy:
   stage: deploy