From 1183c9dc944a36e7a1b628f4e543623528f6934b Mon Sep 17 00:00:00 2001 From: youben11 Date: Fri, 31 Dec 2021 11:37:13 +0100 Subject: [PATCH] fix(ci): fix formatting script seems like big diffs weren't catched. Now we use ifne which checks if the stdin isn't empty --- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/scripts/format_cpp.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 873c98dab..3c1ea682e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -26,7 +26,7 @@ jobs: with: submodules: true - name: Format with clang-format - run: .github/workflows/scripts/format_cpp.sh + run: sudo apt install moreutils && .github/workflows/scripts/format_cpp.sh CheckLicense: runs-on: ubuntu-latest diff --git a/.github/workflows/scripts/format_cpp.sh b/.github/workflows/scripts/format_cpp.sh index c8a4ad61d..4e7ebb5c4 100755 --- a/.github/workflows/scripts/format_cpp.sh +++ b/.github/workflows/scripts/format_cpp.sh @@ -9,6 +9,6 @@ then fi # show changes if any -git diff +git --no-pager diff # fail if there is a diff, success otherwise -! ( git diff | grep -q ^ ) || exit 1 +git diff | ifne exit 1