CI: Use clang 16

1 files changed, 10 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b8846de..5d87d2ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,9 @@ clang_format:
   stage: build
   before_script:
   - apt-get update
-  - apt-get install --yes --no-install-recommends git clang-format-15
+  - apt-get install --yes --no-install-recommends git clang-format-16
   script:
-    - find . \( -name "*.cpp" -or -name "*.h"  -or -name "*.c"  -or -name "*.cc" \) -exec clang-format-15 -i {} \;
+    - find . \( -name "*.cpp" -or -name "*.h"  -or -name "*.c"  -or -name "*.cc" \) -exec clang-format-16 -i {} \;
     - git diff --exit-code
 
 build:
@@ -46,17 +46,17 @@ build:
     - ninja -j ${FDO_CI_CONCURRENT}
     - ctest --output-on-failure
 
-build_clang15_libcpp:
+build_clang16_libcpp:
   stage: build
   script:
     - echo "We want to compile with C++23 here because it has some nice things like deleted std::string nullptr constructor"
     - sed -i -e "s@CMAKE_CXX_STANDARD 17@CMAKE_CXX_STANDARD 23@g" CMakeLists.txt
     - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
-    - apt-get install --yes --no-install-recommends libclang-15-dev llvm-15-dev libc++-15-dev libc++abi-15-dev clang-tidy-15 clang-15 libunwind-15-dev gperf jq
+    - apt-get install --yes --no-install-recommends libclang-16-dev llvm-16-dev libc++-16-dev libc++abi-16-dev clang-tidy-16 clang-16 libunwind-16-dev gperf jq
     - srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
-    - clang++-15 -fPIC -shared -o goostring-format-checker.so $srcdir/test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-15/include/
+    - clang++-16 -fPIC -shared -o goostring-format-checker.so $srcdir/test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-16/include/
     - echo "We disable Qt6 tests since Qt6 exposes std::string in its ABI which makes it not build in this CI since we're using libc++ but Qt6 in debian is build with libstdc++"
-    - CC=clang-15 CXX=clang++-15 cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker -Werror -Wno-deprecated-declarations" -DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_QT6_TESTS=OFF -DENABLE_GPGME=OFF $srcdir
+    - CC=clang-16 CXX=clang++-16 cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker -Werror -Wno-deprecated-declarations" -DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_QT6_TESTS=OFF -DENABLE_GPGME=OFF $srcdir
     - ninja -j ${FDO_CI_CONCURRENT}
     - ctest --output-on-failure
     - echo "This is a complex way of not running clang-tidy over autogenerated files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that https://gitlab.kitware.com/cmake/cmake/-/issues/19772"
@@ -66,7 +66,7 @@ build_clang15_libcpp:
     - echo "Maybe we can replace this with NOLINTBEGIN in the future https://github.com/llvm/llvm-project/issues/56983"
     - find $srcdir/qt* -name *.cpp -exec sed -E -i '/#include .*moc"$/d' {} \;
     - cp "$srcdir/.clang-tidy" .
-    - run-clang-tidy-15
+    - run-clang-tidy-16
 
 build_ubuntu_20_04:
   stage: build
@@ -97,12 +97,12 @@ build_mingw64_fedora38:
     - mingw64-cmake -DENABLE_NSS3=OFF -DENABLE_GPGME=OFF -G Ninja ..
     - ninja
 
-build_clazy_clang15:
+build_clazy_clang16:
   stage: build
   script:
-    - apt-get install --yes --no-install-recommends clazy clang-15
+    - apt-get install --yes --no-install-recommends clazy clang-16
     - mkdir -p build && cd build
-    - CC=clang-15 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DENABLE_GPGME=OFF -G Ninja ..
+    - CC=clang-16 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DENABLE_GPGME=OFF -G Ninja ..
     - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja -j ${FDO_CI_CONCURRENT}
 
 build_qt5_android: