From acbe6a977775755dc29c64ea3196818389d6313a Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Fri, 20 Dec 2024 14:02:06 +0100
Subject: [PATCH] Drop unused clang-format integration in `./ci/run-ci`.

This was already unused since we moved clang-format to a pre-commit
hook.
---
 .cirrus.yml   |  8 ++++----
 ci/Dockerfile |  2 +-
 ci/run-ci     | 11 -----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c9e2e76f6..e714a96c5 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -42,7 +42,7 @@ lint_task:
   update_git_script:
     - git submodule update --recursive --init
 
-  configure_script:   ./ci/run-ci -b build configure debug --cxx-compiler clang++-19 --clang-format `which clang-format-19` --clang-tidy `which clang-tidy-19`
+  configure_script:   ./ci/run-ci -b build configure debug --cxx-compiler clang++-19 --clang-tidy `which clang-tidy-19`
   build_script:       ./ci/run-ci -b build build
   test_code_script:   ./ci/run-ci -b build test-code
 
@@ -77,7 +77,7 @@ clang19_ubuntu_debug_task:
   update_git_script:
     - git submodule update --recursive --init
 
-  configure_script:   ./ci/run-ci -b build configure debug --cxx-compiler clang++-19 --clang-format `which clang-format-19`
+  configure_script:   ./ci/run-ci -b build configure debug --cxx-compiler clang++-19
   build_script:       ./ci/run-ci -b build build
   test_build_script:  ./ci/run-ci -b build test-build
   install_script:     ./ci/run-ci -b build install
@@ -118,7 +118,7 @@ clang19_lts_ubuntu_release_task:
   update_git_script:
     - git submodule update --recursive --init
 
-  configure_script:      ./ci/run-ci -b build configure release --cxx-compiler clang++-19 --clang-format `which clang-format-19`
+  configure_script:      ./ci/run-ci -b build configure release --cxx-compiler clang++-19
   build_script:          ./ci/run-ci -b build build
   test_build_script:     ./ci/run-ci -b build test-build
   install_script:        ./ci/run-ci -b build install
@@ -159,7 +159,7 @@ clang19_lts_ubuntu_release_static_task:
   update_git_script:
     - git submodule update --recursive --init
 
-  configure_script:      ./ci/run-ci -b build configure release --cxx-compiler clang++-19 --clang-format `which clang-format-19`
+  configure_script:      ./ci/run-ci -b build configure release --cxx-compiler clang++-19
   build_script:          ./ci/run-ci -b build build
   install_script:        ./ci/run-ci -b build install
   cleanup_script:        ./ci/run-ci -b build cleanup
diff --git a/ci/Dockerfile b/ci/Dockerfile
index ddf45fc03..b48f7da3c 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update \
  && echo 'deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' >> /etc/apt/sources.list.d/llvm19.list \
  && curl https://apt.llvm.org/llvm-snapshot.gpg.key -o /etc/apt/trusted.gpg.d/llvm.asc \
  && apt-get update \
- && apt-get install -y --no-install-recommends llvm-19-dev clang-19 libclang-19-dev clang-format-19 clang-tidy-19 libclang-rt-19-dev \
+ && apt-get install -y --no-install-recommends llvm-19-dev clang-19 libclang-19-dev clang-tidy-19 libclang-rt-19-dev \
  # Install a recent CMake for `SKIP_LINTING` support.
  && test -f /usr/share/doc/kitware-archive-keyring/copyright || \
     curl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
diff --git a/ci/run-ci b/ci/run-ci
index 55fd7805a..072d97d16 100755
--- a/ci/run-ci
+++ b/ci/run-ci
@@ -45,7 +45,6 @@ Global options:
 Configure options:
 
     --build-toolchain={yes,no}     Build the Spicy compiler toolchain [default: yes]
-    --clang-format <path>          Path to clang-format to use (default: found in PATH)
     --clang-tidy <path>            Path to clang-tidy to use   (default: found in PATH)
     --cxx-compiler <path>          Path to C++ compiler to use (default: found by cmake)
     --disable-precompiled-headers  Disable use of precompiled headers for developer tests
@@ -92,7 +91,6 @@ function run_configure {
     mkdir -p ${install}
     configure="./configure --builddir=${build} --prefix=${install} --generator=Ninja --enable-werror --enable-ccache --with-hilti-compiler-launcher=ccache"
 
-    clang_format=$(which clang-format 2>/dev/null)
     clang_tidy=$(which clang-tidy 2>/dev/null)
 
     if [ "${build_type}" == "release" ]; then
@@ -111,13 +109,6 @@ function run_configure {
                 shift 2;
                 ;;
 
-            --clang-format)
-                test $# -gt 0 || usage
-                clang_format="$2"
-                test -x ${clang_format} || error "clang-format not found in $2"
-                shift 2;
-                ;;
-
             --clang-tidy)
                 test $# -gt 0 || usage
                 clang_tidy="$2"
@@ -153,7 +144,6 @@ function run_configure {
         error "Build directory ${build} already exists, delete first"
     fi
 
-    test -z "${clang_format}" && log_stage "Warning: No clang-format found, will skip any related tests"
     test -z "${clang_tidy}" && log_stage "Warning: No clang-tidy found, will skip any related tests"
 
     # Looks like Cirrus CI doesn't fetch tags.
@@ -164,7 +154,6 @@ function run_configure {
     ${configure} || exit 1
     mkdir -p ${artifacts}
 
-    echo "${clang_format}" >${build}/.clang_format
     echo "${clang_tidy}" >${build}/.clang_tidy
 
     if [ -x "${clang_tidy}" ]; then