Skip to content
Snippets Groups Projects
Commit 422d4045 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon
Browse files

Format: Exclude cmake/upstream from clang-format

parent f917293f
No related branches found
No related tags found
1 merge request!267Add upstream FindMPI
Hide whitespace changes
Inline Side-by-side
scripts/travis/run-format.sh
+ 1
− 1
View file @ 422d4045
...@@ -15,7 +15,7 @@ cd ${SOURCE_DIR} ...@@ -15,7 +15,7 @@ cd ${SOURCE_DIR}
# Check C and C++ code with clang-format # Check C and C++ code with clang-format
echo "Checking formatting for commit range: ${COMMIT_RANGE}" echo "Checking formatting for commit range: ${COMMIT_RANGE}"
DIFF="$(./scripts/developer/git/git-clang-format -x '^thirdparty/' --diff ${COMMIT_RANGE})" DIFF="$(./scripts/developer/git/git-clang-format -x '^(thirdparty|cmake/upstream)/' --diff ${COMMIT_RANGE})"
if [ -n "${DIFF}" ] && [ "${DIFF}" != "no modified files to format" ] if [ -n "${DIFF}" ] && [ "${DIFF}" != "no modified files to format" ]
then then
echo "clang-format:" echo "clang-format:"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment