From e5e07de4a11ad9f88a899a18d04e77a390422798 Mon Sep 17 00:00:00 2001 From: SimonFJ20 Date: Fri, 20 Mar 2026 14:00:16 +0100 Subject: [PATCH] use specific clang-format --- .github/workflows/verify.yml | 8 ++++---- backend/Makefile | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 2f9b494..a2b40fb 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -20,12 +20,12 @@ jobs: sudo ./llvm.sh 22 - name: versions run: | - gcc --version - clang-format --version + clang-22 --version + clang-format-22 --version - name: check working-directory: ./backend - run: make check + run: make check CLANG_FORMAT=clang-format-22 - name: build working-directory: ./backend - run: make all + run: make all CC=clang-22 LD=clang-22 diff --git a/backend/Makefile b/backend/Makefile index 1fd463c..ee7d969 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -3,6 +3,7 @@ MAKEFLAGS += -j16 CC=gcc LD=gcc +CLANG_FORMAT=clang-format CFLAGS = -std=c23 -pedantic-errors -Wall -Wextra -Wconversion LDFLAGS = @@ -45,10 +46,10 @@ $(obj_dir)/%.o: %.c $(CC) $< -c -o $@ -MMD -MP $(CFLAGS) format: - clang-format -style=file -i src/* + $(CLANG_FORMAT) -style=file -i src/* check: - clang-format --dry-run --Werror -style=file src/* + $(CLANG_FORMAT) --dry-run --Werror -style=file src/* clean: rm -rf $(build_dir)