Merge branch 'main' into add_clang_format_check

sjsprecious · Jul 20, 2024 · 6694443 · 6694443
2 parents 5645f0e + 6bc966e
commit 6694443
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml
@@ -22,7 +22,13 @@ jobs:
 
       - name: Format code
         run: |
+<<<<<<< HEAD
           find src -type f \( -name '*.cc' -o -name '*.hh' -o -name '*.h' -o -name '*.cpp' \) -exec clang-format -i --style=file --verbose {} +
+=======
+          find include -type f \( -name '*.hpp' -o -name '*.h' -o -name '*.cuh' -o -name '*.inl' \) -exec clang-format -i --style=file --verbose {} +
+          find src -type f \( -name '*.cu' -o -name '*.hpp' -o -name '*.h' -o -name '*.cpp' \) -exec clang-format -i --style=file --verbose {} +
+          find test -type f \( -name '*.hpp' -o -name '*.h' -o -name '*.cpp' -o -name '*.cuh' -o -name '*.cu' \) ! -path 'test/tutorial/*' -exec clang-format -i --style=file --verbose {} +
+>>>>>>> main
 
       - name: Check for changes
         id: check-changes