From bb2b168a1b4ce9cb471157dd688f4b450a905a0e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 3 May 2017 22:41:03 +0300 Subject: Add nsiqcppstyle check tool into .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++++++ tools/ci/jobs/nsiqcppstyle.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100755 tools/ci/jobs/nsiqcppstyle.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec2bb0b70..92be10e2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -329,6 +329,14 @@ icccheck: variables: PACKAGES: imagemagick +nsiqcppstyle: + stage: prebuild + script: + - ./tools/ci/jobs/nsiqcppstyle.sh + <<: *job-push + variables: + PACKAGES: "git python grep" + # tests # disabled due memory issue. Probably out of memory of gcc issues diff --git a/tools/ci/jobs/nsiqcppstyle.sh b/tools/ci/jobs/nsiqcppstyle.sh new file mode 100755 index 000000000..5e2785f54 --- /dev/null +++ b/tools/ci/jobs/nsiqcppstyle.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +export LOGFILE=nsiqcppstyle.log + +source ./tools/ci/scripts/init.sh + +rm -rf nsiqcppstyle.git +./tools/ci/scripts/retry.sh git clone https://gitlab.com/4144/nsiqcppstyle nsiqcppstyle.git + +./nsiqcppstyle.git/nsiqcppstyle --ci --show-url src \ +| grep -v "catch.hpp" \ +| grep -v "sdl2gfx" \ +| grep -v "/debug/" \ +>logs/nsiqcppstyle1.log + +cat logs/nsiqcppstyle1.log \ +| grep -v -E "gamemodifiers[.]cpp(.+): Incorrect align on long parameter list in front of '(N_|{|})'" \ +| grep -v -E "graphics_calcImageRect[.]hpp(.+): function [(]calcTileVertexesInline[)] has non named parameter" \ +| grep -v -E "dye[.]cpp(.+): Do not use goto keyword" \ +| grep -v -E "item/item[.]cpp(.+): function [(]dragDrop[)] has non named parameter" \ +| grep -v -E "windowmenu[.]cpp(.+): function [(]addButton[)] has non named parameter" \ +| grep -v -E "windowmenu[.]cpp(.+): Incorrect align on long parameter list in front of '(.|Visible_true)', it should be aligen in column 15" \ +| grep -v -E "channeltab[.]h(.+): Incorrect align on long parameter list in front of 'const'" \ +| grep -v -E "/enums/simpletypes/(.+): function [(]defIntEnum[)] has non named parameter" \ +>${ERRFILE} + +export data=$(cat ${ERRFILE}) +if [ "$DATA" != "" ]; then + echo "Warnings detected" + cat ${ERRFILE} +fi -- cgit v1.2.3-60-g2f50