Skip to content

Commit

Permalink
use cmake-format instead of gersemi in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuuichi Asahi committed Feb 21, 2025
1 parent 1890cc3 commit 651195e
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 77 deletions.
32 changes: 32 additions & 0 deletions .cmake-format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# SPDX-FileCopyrightText: (C) The kokkos-fft development team, see COPYRIGHT.md file
#
# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception

# -----------------------------
# Options affecting formatting.
# -----------------------------
with section("format"):

# How wide to allow formatted cmake files
line_width = 120

# If an argument group contains more than this many sub-groups (parg or kwarg
# groups) then force it to a vertical layout.
max_subgroups_hwrap = 3

# If a statement is wrapped to more than one line, than dangle the closing
# parenthesis on its own line.
dangle_parens = True

# If the trailing parenthesis must be 'dangled' on its on line, then align it
# to this reference: `prefix`: the start of the statement, `prefix-indent`:
# the start of the statement, plus one indentation level, `child`: align to
# the column of the arguments
dangle_align = 'prefix'

# ------------------------------------------------
# Options affecting comment reflow and formatting.
# ------------------------------------------------
with section("markup"):
# enable comment markup parsing and reflow
enable_markup = False
22 changes: 22 additions & 0 deletions .github/workflows/__clang-format-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SPDX-FileCopyrightText: (C) The kokkos-fft development team, see COPYRIGHT.md file
#
# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception

name: clang-format check

on:
workflow_call:

permissions: read-all

jobs:
clang-formatting-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: DoozyX/clang-format-lint-action@v0.18
with:
source: 'common/ fft/ examples/ install_test/'
exclude: ''
extensions: 'hpp,cpp'
clangFormatVersion: 17
23 changes: 23 additions & 0 deletions .github/workflows/__cmake-format-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# SPDX-FileCopyrightText: (C) The kokkos-fft development team, see COPYRIGHT.md file
#
# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception

name: cmake-format check

on:
workflow_call:

permissions: read-all

jobs:
cmake-formatting-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: cmake-format lint action
uses: puneetmatharu/cmake-format-lint-action@2ac346e79e7ceac958bc637c1391285fb335ed7c # v1.0.5
with:
args: --config-files .cmake-format.py --in-place
file-regex: '(.*\.cmake$|.*\.cmake\.in$|CMakeLists.txt$)'
- name: check
run: git diff --exit-code
18 changes: 7 additions & 11 deletions .github/workflows/build_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,15 @@ env:

jobs:
# run linter on the code
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: DoozyX/clang-format-lint-action@v0.18
with:
source: 'common/ fft/ examples/ install_test/'
exclude: ''
extensions: 'hpp,cpp'
clangFormatVersion: 17
clang-format-check:
uses: ./.github/workflows/__clang-format-check.yaml

# run cmake format check
cmake-format-check:
uses: ./.github/workflows/__cmake-format-check.yaml

# run typos for spell check
spell_check:
spell-check:
name: spell check with typos
runs-on: ubuntu-latest
steps:
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/pytest.yml

This file was deleted.

9 changes: 0 additions & 9 deletions python/.gersemirc

This file was deleted.

24 changes: 0 additions & 24 deletions python/pyproject.toml

This file was deleted.

0 comments on commit 651195e

Please sign in to comment.