etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12622 from liamwhite/format

Browse source 
ci: make verify format workflow output more helpful
This commit is contained in:
liamwhite 2024-01-09 07:31:34 -05:00 committed by GitHub
commit 5fde5e62a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
.ci/scripts/format/script.sh
View file

@ -3,38 +3,33 @@
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \ shopt -s nullglob globstar
if grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \
dist/*.svg dist/*.xml; then dist/*.svg dist/*.xml; then
echo Trailing whitespace found, aborting echo Trailing whitespace found, aborting
exit 1 exit 1
fi fi
# Default clang-format points to default 3.5 version one # Default clang-format points to default 3.5 version one
CLANG_FORMAT=${CLANG_FORMAT:-clang-format-15} CLANG_FORMAT="${CLANG_FORMAT:-clang-format-15}"
$CLANG_FORMAT --version "$CLANG_FORMAT" --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
# 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\)$' || true)"
else
# Check everything for branch pushes
files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
fi
# Turn off tracing for this because it's too verbose # Turn off tracing for this because it's too verbose
set +x set +x
for f in $files_to_lint; do # Check everything for branch pushes
d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true) FILES_TO_LINT="$(find src/ -name '*.cpp' -or -name '*.h')"
if ! [ -z "$d" ]; then
echo "!!! $f not compliant to coding style, here is the fix:" for f in $FILES_TO_LINT; do
echo "$d" echo "$f"
fail=1 "$CLANG_FORMAT" -i "$f"
fi
done done
set -x DIFF=$(git diff)
if [ "$fail" = 1 ]; then if [ ! -z "$DIFF" ]; then
echo "!!! Not compliant to coding style, here is the fix:"
echo "$DIFF"
exit 1 exit 1
fi fi