1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: add conflict marker check during CI lint

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/7625
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Brian White 2016-07-08 19:22:46 -04:00
parent 814b8c3cf7
commit 68b966b2de
No known key found for this signature in database
GPG Key ID: 606D7358F94DA209
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -706,7 +706,16 @@ cpplint:
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
lint: jslint cpplint
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
lint-ci: jslint-ci cpplint
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
&& ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
exit 0 ; \
else \
echo "" >&2 ; \
echo "Conflict marker detected in one or more files. Please fix them first." >&2 ; \
exit 1 ; \
fi
else
lint:
@echo "Linting is not available through the source tarball."