pre-commit - replace cmake-format/cmake-lint with gersemi

gersemi <https://github.com/BlankSpruce/gersemi> seems to do a better job than cmake-format, plus it is actively supported.
libical · Dec 15, 2024 · d467166 · d467166
1 parent 37409de
commit d467166
Show file tree

Hide file tree

Showing 31 changed files with 1,802 additions and 1,157 deletions.
diff --git a/.cmake-format.py b/.cmake-format.py
diff --git a/.gersemirc b/.gersemirc
@@ -0,0 +1,4 @@
+definitions: [./cmake,./src/test,./docs]
+indent: 2
+line_length: 120
+list_expansion: favour-expansion
diff --git a/.krazy b/.krazy
@@ -8,7 +8,6 @@ EXTRA crud,camelcase
 
 #For now skip java
 SKIP /java/
-SKIP \.cmake-format\.py
 #For now skip perl
 SKIP /Net-ICal-Libical/
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,21 +31,17 @@ repos:
   hooks:
     # Run the linter.
     - id: ruff
-      exclude: ^(.cmake-format.py)
     # Run the formatter.
     - id: ruff-format
-      exclude: ^(.cmake-format.py)
 - repo: https://github.com/codespell-project/codespell
   rev: v2.3.0
   hooks:
   - id: codespell
     exclude: ^(CONTRIBUTORS.md)
-- repo: https://github.com/cheshirekow/cmake-format-precommit
-  rev: v0.6.13
+- repo: https://github.com/BlankSpruce/gersemi
+  rev: 0.17.1
   hooks:
-  - id: cmake-lint
-    exclude: (cmake/Toolchain-|.h.cmake|/Doxyfile.cmake)
-  - id: cmake-format
+  - id: gersemi
     exclude: (cmake/Toolchain-|.h.cmake|/Doxyfile.cmake)
 - repo: https://github.com/DavidAnson/markdownlint-cli2
   rev: v0.15.0