From 47f2e3de19865df1e7586e47bdd3672212c8e8aa Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <schmiedt@uni-bremen.de>
Date: Wed, 18 Sep 2024 18:03:45 +0200
Subject: [PATCH] PIPELINE: Update clang-format to clang-format-16

---
 .docker/Dockerfile | 6 +++---
 Makefile           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 61c6d62..8ae7ca4 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update
 RUN apt-get install -y cmake
 RUN apt-get install -y lcov
 RUN apt-get install -y doxygen graphviz
-RUN apt-get install -y clang-format clang-tidy
+RUN apt-get install -y clang-format-16 clang-tidy
 RUN apt-get install -y python3-pip python3-venv
 RUN apt-get install -y git  
 RUN apt-get install -y curl zip unzip tar
@@ -28,5 +28,5 @@ RUN git rev-parse HEAD > libcaosdb_commit
 RUN rm -rf .git
 
 # build dependencies
-RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Debug
-RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Release
+#RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Debug
+#RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Release
diff --git a/Makefile b/Makefile
index 47e9c56..368cb1b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 # This Makefile is a wrapper for several other scripts.
 
 
-CLANG_FORMAT ?= clang-format
+CLANG_FORMAT ?= clang-format-16
 CONAN_SETTINGS = "compiler.libcxx=libstdc++11"
 
 # OS specific handling, with code by Ken Jackson and oHo,
-- 
GitLab