Skip to content

Commit ade74ef

Browse files
jgoppertbperseghetti
authored andcommitted
Switch to clang-format-18 and remove pipx requirements.
Signed-off-by: James Goppert <james.goppert@gmail.com>
1 parent f3ecaa2 commit ade74ef

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

.github/workflows/build.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
- name: Install Dependencies
2323
run: |
2424
apt update
25-
apt install curl pipx -y
26-
pipx install clang-format==18.1.8
27-
pipx install poetry==1.8.3
25+
apt install curl python3-poetry clang-format-18 -y
2826
poetry config --list
2927
3028
- name: Checkout

CMakeLists.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
88

99
zephyr_include_directories(include)
1010

11-
find_program(PIPX pipx)
12-
if (NOT PIPX)
13-
message(FATAL_ERROR "install pipx via: sudo apt install pipx")
14-
endif()
15-
1611
find_program(POETRY poetry)
1712
if (NOT POETRY)
18-
message(FATAL_ERROR "install poetry via: pipx install poetry")
13+
message(FATAL_ERROR "install poetry via: apt install python3-poetry or pipx install poetry")
1914
endif()
2015
set(CEREBRI_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
2116
set(CYECCA_PYTHON ${CEREBRI_ROOT_DIR}/scripts/cyecca_python)

scripts/format_command.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ def do_run(self, args, unknown_args):
5858
if regex.match(file):
5959
file_path = os.path.join(root, file)
6060
if args.check:
61-
cmd_str = ['clang-format', '--dry-run', '--Werror', '-style', 'file', f'{file_path}']
61+
cmd_str = ['clang-format-18', '--dry-run', '--Werror', '-style', 'file', f'{file_path}']
6262
else:
63-
cmd_str = ['clang-format', '-i', '-style', 'file', f'{file_path}']
63+
cmd_str = ['clang-format-18', '-i', '-style', 'file', f'{file_path}']
6464
try:
6565
res = subprocess.run(cmd_str, capture_output=False, check=True)
6666
except Exception as e:

0 commit comments

Comments
 (0)