diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 20d4a4fec..496b48467 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -1,17 +1,7 @@
-# Copyright (c) 2023 Valve Corporation
-# Copyright (c) 2023 LunarG, Inc.
+# Copyright 2026 Valve Corporation
+# Copyright 2026 LunarG, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 
 name: format
 
@@ -28,16 +18,18 @@ jobs:
   clang-format:
     name: clang-format
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        path:
-          - 'loader'
-          - 'tests'
+
+    env:
+      CLANG_FORMAT_VERSION: 16
+      CLANG_FORMAT_FILES: "*.c *.h *.cpp *.hpp"
+
     steps:
     - uses: actions/checkout@v6.0.2
-    - name: Run clang-format
-      uses: jidicula/clang-format-action@v4.16.0
-      with:
-        clang-format-version: '16'
-        check-path: ${{ matrix.path }}
+    - name: Check formatting
+      run: |
+        for f in $(git ls-files -- ${CLANG_FORMAT_FILES}); do
+          echo "Checking $f"
+          clang-format-${CLANG_FORMAT_VERSION} -i --Werror "$f"
+        done
+
+        git diff --exit-code