diff --git a/.github/workflows/pull-request-check-clang-format.sh b/.github/workflows/pull-request-check-clang-format.sh index 0cc96948b41..1694f1e8711 100755 --- a/.github/workflows/pull-request-check-clang-format.sh +++ b/.github/workflows/pull-request-check-clang-format.sh @@ -26,7 +26,7 @@ echo "Checking for formatting errors introduced since $MERGE_BASE" # Do the checking. "eval" is used so that quotes (as inserted into $EXCLUDES # above) are not interpreted as parts of file names. -eval git-clang-format --binary clang-format-11 $MERGE_BASE -- $EXCLUDES +eval git-clang-format-11 --binary clang-format-11 $MERGE_BASE -- $EXCLUDES git diff > formatted.diff if [[ -s formatted.diff ]] ; then echo 'Formatting error! The following diff shows the required changes' diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index 5fbef4f9197..1223ac5a7ff 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -612,9 +612,6 @@ jobs: run: | sudo apt-get update sudo apt-get install --no-install-recommends -yq clang-format-11 - wget -O git-clang-format https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-14.0.6/clang/tools/clang-format/git-clang-format - chmod u+x git-clang-format - mv git-clang-format /usr/local/bin - name: Check updated lines of code match clang-format-11 style env: BASE_BRANCH: ${{ github.base_ref }}