mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 15:49:09 +01:00
Merge pull request #2099 from citra-emu/fix-clang-format
Fix clang-format lint
This commit is contained in:
commit
c59bdecd23
1 changed files with 2 additions and 2 deletions
|
@ -17,7 +17,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
||||||
|
|
||||||
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
|
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
|
||||||
# Get list of every file modified in this pull request
|
# Get list of every file modified in this pull request
|
||||||
files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$')"
|
files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)"
|
||||||
else
|
else
|
||||||
# Check everything for branch pushes
|
# Check everything for branch pushes
|
||||||
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
|
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
|
||||||
|
@ -27,7 +27,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
for f in $files_to_lint; do
|
for f in $files_to_lint; do
|
||||||
d=$(diff -u "$f" <($CLANG_FORMAT "$f"))
|
d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true)
|
||||||
if ! [ -z "$d" ]; then
|
if ! [ -z "$d" ]; then
|
||||||
echo "!!! $f not compliant to coding style, here is the fix:"
|
echo "!!! $f not compliant to coding style, here is the fix:"
|
||||||
echo "$d"
|
echo "$d"
|
||||||
|
|
Loading…
Reference in a new issue