ci: fix nix cpp build wrappers

Author: darwin67

.github/scripts/clang-tidy-nix.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+extra_args=()
+if [[ -n "${NIX_CFLAGS_COMPILE:-}" ]]; then
+  # Nix cc setup hooks expose system include paths through compiler flags.
+  # clang-tidy needs those flags explicitly because it does not execute the
+  # Nix compiler wrapper while parsing the compile database.
+  nix_cflags=( ${NIX_CFLAGS_COMPILE} )
+  for flag in "${nix_cflags[@]}"; do
+    extra_args+=( "--extra-arg=$flag" )
+  done
+fi
+
+exec clang-tidy "${extra_args[@]}" "$@"

.github/workflows/build-kuebikodb.yaml

@@ -24,6 +24,7 @@ jobs:
       CCACHE_MAXSIZE: 2G
       CCACHE_BASEDIR: ${{ github.workspace }}
       CCACHE_NOHASHDIR: true
+      NODISTCC: true
     outputs:
       md5sum: ${{ steps.checksum.outputs.md5sum }}
     steps:
@@ -44,22 +45,13 @@ jobs:
       - name: Configure ccache
         if: ${{ inputs.enable_ccache }}
         run: |
-          nix develop .#cpp -c sh -c '
-            mkdir -p "$CCACHE_DIR" "$GITHUB_WORKSPACE/.cache-wrappers"
-            printf "#!/bin/sh\nexec ccache clang \"\$@\"\n" > "$GITHUB_WORKSPACE/.cache-wrappers/clang"
-            printf "#!/bin/sh\nexec ccache clang++ \"\$@\"\n" > "$GITHUB_WORKSPACE/.cache-wrappers/clang++"
-            chmod +x "$GITHUB_WORKSPACE/.cache-wrappers/clang" "$GITHUB_WORKSPACE/.cache-wrappers/clang++"
-            ccache --max-size="$CCACHE_MAXSIZE"
-            ccache --zero-stats
-          '
+          mkdir -p "$CCACHE_DIR"
+          nix develop .#cpp -c ccache --max-size="$CCACHE_MAXSIZE"
+          nix develop .#cpp -c ccache --zero-stats
       - name: Generate the building system
         run: |
           git config --global --add safe.directory $GITHUB_WORKSPACE
-          if [ '${{ inputs.enable_ccache }}' = 'true' ]; then
-            nix develop .#cpp -c ./configure.py --mode ${{ inputs.build_mode }} --with scylla --compiler "$GITHUB_WORKSPACE/.cache-wrappers/clang++" --c-compiler "$GITHUB_WORKSPACE/.cache-wrappers/clang"
-          else
-            nix develop .#cpp -c ./configure.py --mode ${{ inputs.build_mode }} --with scylla
-          fi
+          nix develop .#cpp -c ./configure.py --mode ${{ inputs.build_mode }} --with scylla
       - run: |
           nix develop .#cpp -c ninja build/${{ inputs.build_mode }}/scylla
       - id: checksum

.github/workflows/clang-tidy.yaml

@@ -41,6 +41,7 @@ jobs:
       CCACHE_MAXSIZE: 2G
       CCACHE_BASEDIR: ${{ github.workspace }}
       CCACHE_NOHASHDIR: true
+      NODISTCC: true
     steps:
       - uses: actions/checkout@v4
         with:
@@ -66,11 +67,12 @@ jobs:
             -DCMAKE_BUILD_TYPE=$BUILD_TYPE              \
             -DCMAKE_C_COMPILER=clang                    \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache          \
+            -DCMAKE_CXX_FLAGS="-Wno-error=deprecated-builtins" \
             -DScylla_USE_LINKER=ld.lld                  \
             -DCMAKE_CXX_COMPILER=clang++                \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache        \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON          \
-            -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--checks=$CLANG_TIDY_CHECKS" \
+            -DCMAKE_CXX_CLANG_TIDY="bash;$GITHUB_WORKSPACE/.github/scripts/clang-tidy-nix.sh;--checks=$CLANG_TIDY_CHECKS" \
             -G Ninja                                    \
             -B $BUILD_DIR                               \
             -S .

flake.nix

@@ -28,6 +28,8 @@
             (final: prev: {
               # default.nix predates current nixpkgs and still references
               # package names that have been removed from unstable.
+              antlr3 = prev.antlr3_4;
+              fmt = prev.fmt_10;
               llvmPackages_15 = prev.llvmPackages;
               boost175 = prev.boost181;
               libyamlcpp = prev.yaml-cpp;