diff --git a/.github/workflows/clang-tidy-lint.yml b/.github/workflows/clang-tidy-lint.yml
index edbf2093aa..a2949e2728 100644
--- a/.github/workflows/clang-tidy-lint.yml
+++ b/.github/workflows/clang-tidy-lint.yml
@@ -35,7 +35,15 @@ jobs:
 
     - name: Analyze
       run: |
-        git diff -U0 HEAD^ | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
+        run-clang-tidy -j$(nproc) -p=build \
+          -header-filter="(core|engine)/include/.*" \
+          files "(core|engine)/(src|samples|tests)/.*" \
+          -export-fixes clang-tidy-result/fixes.yml
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: clang-tidy-fixes
+        path: clang-tidy-result/fixes.yml
 
     - name: Run clang-tidy-pr-comments action
       uses: platisd/clang-tidy-pr-comments@master