From 30743eff5669a5557b1c00424f84865b8b3ff6ad Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 8 Jan 2024 09:15:19 -0500 Subject: ci: make verify format workflow output more helpful --- .ci/scripts/format/script.sh | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to '.ci/scripts/format/script.sh') diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 25b0718f0..c9c5e4fac 100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -3,38 +3,33 @@ # SPDX-FileCopyrightText: 2019 yuzu Emulator Project # 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 echo Trailing whitespace found, aborting exit 1 fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=${CLANG_FORMAT:-clang-format-15} -$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 +CLANG_FORMAT="${CLANG_FORMAT:-clang-format-15}" +"$CLANG_FORMAT" --version # Turn off tracing for this because it's too verbose set +x -for f in $files_to_lint; do - d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true) - if ! [ -z "$d" ]; then - echo "!!! $f not compliant to coding style, here is the fix:" - echo "$d" - fail=1 - fi +# Check everything for branch pushes +FILES_TO_LINT="$(find src/ -name '*.cpp' -or -name '*.h')" + +for f in $FILES_TO_LINT; do + echo "$f" + "$CLANG_FORMAT" -i "$f" 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 fi -- cgit v1.2.3 From e11a3414ae7114954345512e75583d0cf199c8c6 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 10 Jan 2024 11:52:58 -0500 Subject: ci: fix format task --- .ci/scripts/format/script.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.ci/scripts/format/script.sh') diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index c9c5e4fac..572fa9ffb 100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -5,8 +5,7 @@ shopt -s nullglob globstar -if grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \ - dist/*.svg dist/*.xml; then +if git grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop dist/*.svg dist/*.xml; then echo Trailing whitespace found, aborting exit 1 fi -- cgit v1.2.3 From 84787a2adaa58794ff72627ec2231da863b104c1 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 11 Jan 2024 18:57:07 -0500 Subject: ci: fix file mode check in format script --- .ci/scripts/format/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.ci/scripts/format/script.sh') diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 572fa9ffb..c22398de0 100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -25,7 +25,7 @@ for f in $FILES_TO_LINT; do "$CLANG_FORMAT" -i "$f" done -DIFF=$(git diff) +DIFF=$(git -c core.fileMode=false diff) if [ ! -z "$DIFF" ]; then echo "!!! Not compliant to coding style, here is the fix:" -- cgit v1.2.3 From cdeaca73c460fa4a85d2f7d493828711f90e8747 Mon Sep 17 00:00:00 2001 From: t895 Date: Thu, 11 Jan 2024 21:53:11 -0500 Subject: android: Move ktlintCheck to yuzu-verify --- .ci/scripts/format/script.sh | 3 +++ .github/workflows/verify.yml | 8 +++++--- src/android/app/build.gradle.kts | 9 ++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to '.ci/scripts/format/script.sh') diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index c22398de0..f9c63dbfa 100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -32,3 +32,6 @@ if [ ! -z "$DIFF" ]; then echo "$DIFF" exit 1 fi + +cd src/android +./gradlew ktlintCheck diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index c073f3f3f..62eb69aeb 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -13,13 +13,15 @@ jobs: format: name: 'verify format' runs-on: ubuntu-latest - container: - image: yuzuemu/build-environments:linux-clang-format - options: -u 1001 steps: - uses: actions/checkout@v3 with: submodules: false + - name: set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' - name: 'Verify Formatting' run: bash -ex ./.ci/scripts/format/script.sh build: diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 53aafa08c..d62254dd3 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -188,8 +188,15 @@ tasks.create("ktlintReset") { delete(File(buildDir.path + File.separator + "intermediates/ktLint")) } +val showFormatHelp = { + logger.lifecycle( + "If this check fails, please try running \"gradlew ktlintFormat\" for automatic " + + "codestyle fixes" + ) +} +tasks.getByPath("ktlintKotlinScriptCheck").doFirst { showFormatHelp.invoke() } +tasks.getByPath("ktlintMainSourceSetCheck").doFirst { showFormatHelp.invoke() } tasks.getByPath("loadKtlintReporters").dependsOn("ktlintReset") -tasks.getByPath("preBuild").dependsOn("ktlintCheck") ktlint { version.set("0.47.1") -- cgit v1.2.3