Use clang-format-18

Ajatt-Tools · Sep 19, 2024 · 4c6df80 · 4c6df80
1 parent 376f31c
commit 4c6df80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,13 +13,19 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@v1
         with:
-          packages: gcc-10 clang clang-format clang-tidy cppcheck liblmdb-dev libmecab-dev libgtk-3-dev \
+          packages: gcc-10 clang clang-tidy cppcheck liblmdb-dev libmecab-dev libgtk-3-dev \
             libx11-dev libcurl4-openssl-dev libnotify-dev libzip-dev zipcmp zipmerge ziptool libcgreen1-dev \
             gperf gettext
           version: 1.0
 
+      - name: Install LLVM and Clang 18
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 18
+          sudo apt-get install -y clang-format-18
+
       - run: gcc --version
-      - run: clang-format --version
 
       - run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
       - run: cmake --build build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,7 @@ endif ()
 # ##############################################################################
 # Dev Dependencies
 # ##############################################################################
-find_program(CLANG_FORMAT "clang-format")
+find_program(CLANG_FORMAT "clang-format-18")
 find_program(CPPCHECK cppcheck)
 find_program(CLANG_TIDY "clang-tidy")