From b426d92dcbb6e760ed20cc02b93fb180e3c950a7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 1 Mar 2019 21:37:31 +0300 Subject: Add ci checks for bad new lines or trailing white spaces --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ .tools/jobs/newlines.sh | 10 ++++++++++ .tools/jobs/spaces.sh | 10 ++++++++++ 3 files changed, 43 insertions(+) create mode 100755 .tools/jobs/newlines.sh create mode 100755 .tools/jobs/spaces.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4216c7f1..8650a016 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,29 @@ variables: MYSQL_ROOT_PASSWORD: root packetver: "20150513" +newlines: + stage: build + script: + - ./.tools/jobs/install.sh "dos2unix git-core" + - ./.tools/jobs/newlines.sh + image: debian:unstable + artifacts: + untracked: true + when: always + expire_in: 3 week + +spaces: + stage: build + script: + - ./.tools/jobs/install.sh "sed git-core" + - cd npc + - ../.tools/jobs/spaces.sh + image: debian:unstable + artifacts: + untracked: true + when: always + expire_in: 3 week + build_test: stage: build script: diff --git a/.tools/jobs/newlines.sh b/.tools/jobs/newlines.sh new file mode 100755 index 00000000..23309f70 --- /dev/null +++ b/.tools/jobs/newlines.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +find -H . -type f -name "*.txt" -o -name "*.conf" -exec dos2unix {} \; + +export RES=$(git diff --name-only) +if [[ -n "${RES}" ]]; then + echo "Wrong new lines detected in files:" + git diff --name-only + exit 1 +fi diff --git a/.tools/jobs/spaces.sh b/.tools/jobs/spaces.sh new file mode 100755 index 00000000..b0f485db --- /dev/null +++ b/.tools/jobs/spaces.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +find -H . -type f -name "*.txt" -exec sed -i 's/[[:blank:]]*$//' {} \; + +export RES=$(git diff --name-only) +if [[ -n "${RES}" ]]; then + echo "Extra spaces before new lines detected in files:" + git diff --name-only + exit 1 +fi -- cgit v1.2.3-60-g2f50