From 6a80fb4f3af1f3581b4703c92508545f5382a561 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Fri, 27 Oct 2023 11:38:34 -0400
Subject: [PATCH] Simplify clang-format CI job (#399)

* Simplify clang-format CI job

* Re-add clang-format version specification

* Remove formatting check from BoringSSL file

* Introduce a trivial change to verify that clang-format CI job sees the right files

* clang-format
---
 .github/workflows/boring.yml  | 21 ---------------------
 .github/workflows/main_ci.yml | 12 ++----------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/boring.yml b/.github/workflows/boring.yml
index 72dee4b0..62da2ee4 100644
--- a/.github/workflows/boring.yml
+++ b/.github/workflows/boring.yml
@@ -17,27 +17,6 @@ env:
   VCPKG_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
 
 jobs:
-  formatting-check:
-    name: Formatting Check
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        path:
-          - 'include'
-          - 'src'
-          - 'test'
-          - 'cmd'
-          - 'lib'
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Run clang-format style check for C/C++ programs
-      uses: jidicula/clang-format-action@v4.11.0
-      with:
-        clang-format-version: '16'
-        check-path: ${{ matrix.path }}
-        fallback-style: 'Mozilla'
-
   platform-sanitizer-tests:
     name: Build and test platforms using sanitizers and clang-tidy
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
index 1e6ef406..78b73681 100644
--- a/.github/workflows/main_ci.yml
+++ b/.github/workflows/main_ci.yml
@@ -25,22 +25,14 @@ jobs:
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        path:
-          - 'include'
-          - 'src'
-          - 'test'
-          - 'cmd'
-          - 'lib'
     steps:
     - uses: actions/checkout@v4
 
     - name: Run clang-format style check for C/C++ programs
       uses: jidicula/clang-format-action@v4.11.0
       with:
-        clang-format-version: '16'
-        check-path: ${{ matrix.path }}
+        clang-format-version: 16
+        include-regex: '^\./(src|include|test|cmd)/.*\.(cpp|h)$'
         fallback-style: 'Mozilla'
 
   quick-linux-interop-check: