Merge pull request #20 from hzeller/feature-20250921-latest-format

Use later versions of clang-format

Author: hzeller

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
           # TODO: package ?
 
   CodeFormatting:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -64,13 +64,17 @@ jobs:
 
       - name: Install Dependencies
         run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x ./llvm.sh
+          sudo ./llvm.sh 19
+          sudo apt install -y clang-format-19
           go install github.com/bazelbuild/buildtools/buildifier@latest
           echo "PATH=$PATH:$(go env GOPATH)/bin/" >> $GITHUB_ENV
 
       - name: Run formatting style check
         run: |
-          clang-format-17 --version
-          CLANG_FORMAT=clang-format-17 scripts/run-format.sh
+          clang-format-19 --version
+          CLANG_FORMAT=clang-format-19 scripts/run-format.sh
           git diff > /tmp/format-diff
           if [ -s "/tmp/format-diff" ]; then
             echo "Difference to optimal formatting"
@@ -82,6 +86,8 @@ jobs:
             echo "  git commit -a --amend"
             echo "  git push -f"
             exit 1
+          else
+            echo "No changes. Good."
           fi
 
   RunBantOnBant:
@@ -102,7 +108,7 @@ jobs:
           # This tests the static binary provided in the release, so
           # instead of simply compiling and running locally, we fetch that.
           # TODO: provide this as action where we simply say with version=...
-          VERSION="v0.2.2"
+          VERSION="v0.2.3"
           STATIC_VERSION="bant-${VERSION}-linux-static-x86_64"
           wget "https://github.com/hzeller/bant/releases/download/${VERSION}/${STATIC_VERSION}.tar.gz"
           tar xvzf "${STATIC_VERSION}.tar.gz"

bant/tool/dwyu_test.cc

@@ -130,7 +130,7 @@ class DWYUTestFixture {
   explicit DWYUTestFixture(const ParsedProject &project, int verbose_level = 1)
       : session_{&log_messages_, &log_messages_,
                  CommandlineFlags{.verbose = verbose_level}},
-        dwyu_(session_, project, edit_expector_.checker()){};
+        dwyu_(session_, project, edit_expector_.checker()) {}
 
   ~DWYUTestFixture() {
     // Make sure that if there is a log output that the test will look for it.

shell.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> {} }:
 let
   bant_used_stdenv = pkgs.stdenv;        # no layering_check but clangd works
-  #bant_used_stdenv = pkgs.clang17Stdenv;  # layering_check works, but clangd fails to understand c++ headers.
+  #bant_used_stdenv = pkgs.clang19Stdenv;  # layering_check works, but clangd fails to understand c++ headers.
 in
 bant_used_stdenv.mkDerivation {
   name = "bant-build-environment";
@@ -10,16 +10,12 @@ bant_used_stdenv.mkDerivation {
       bazel_7
       jdk11
 
-      clang-tools_17    # for clang-format
-      clang-tools_19    # for clang-tidy
+      clang-tools_19    # for clang-tidy, clang-format
       bazel-buildtools  # buildifier, buildozer
     ];
   shellHook = ''
       # clang tidy: use latest.
       export CLANG_TIDY=${pkgs.clang-tools_19}/bin/clang-tidy
-
-      # There is too much volatility between even micro-versions of
-      # newer clang-format. Let's use older for now.
-      export CLANG_FORMAT=${pkgs.clang-tools_17}/bin/clang-format
+      export CLANG_FORMAT=${pkgs.clang-tools_19}/bin/clang-format
   '';
 }