Merge branch 'clang-format' into 'master'

Some clang-format enhancements

See merge request ogs/ogs!4683

.pre-commit-config.yaml

@@ -82,3 +82,11 @@ repos:
  hooks:
  - id: ruff
  files: "Applications/Python/.*"
+ # Enable on demand, run with
+ # pre-commit run --all-files clang-format
+ #
+ # - repo: https://github.com/pocc/pre-commit-hooks
+ # rev: master
+ # hooks:
+ # - id: clang-format
+ # args: ["-i"]

scripts/ci/jobs/pre-commit.yml

@@ -16,7 +16,6 @@ clang-format:
  rules:
  - if: $CI_MERGE_REQUEST_IID
  needs: [ci_images]
- allow_failure: true
  script:
  - git clang-format --extensions "h,cpp" ${CI_MERGE_REQUEST_DIFF_BASE_SHA}
  - if [[ $(git diff) ]]; then exit 1; fi

web/content/docs/devguide/development-workflows/code-format/index.md

@@ -21,6 +21,16 @@ Use [`clang-format`](https://clang.llvm.org/docs/ClangFormat.html). It can be ad
 
 The current style is defined in [.clang-format](https://gitlab.opengeosys.org/ogs/ogs/-/blob/master/.clang-format).
 
+You can also run via the command line:
+
+```bash
+clang-format -i path/to/file.cpp
+# OR clang-format on changed lines only:
+git clang-format -i path/to/file.cpp
+# OR run on all files, e.g.:
+find -E . -regex '.*\.(cpp|h)' -exec clang-format -i {} \;
+```
+
 ## Python
 
 Use [`black`](https://black.readthedocs.io/en/stable/). It can be added to be automatically run on save in your editor / IDE: