iox-eclipse-iceoryx#1755 Use v18 of clang-format and clang-tidy

elBoberido · Jan 8, 2025 · 60961c1 · 60961c1
1 parent 325dea7
commit 60961c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/actions/install-iceoryx-deps-and-clang/action.yml b/.github/actions/install-iceoryx-deps-and-clang/action.yml
@@ -7,16 +7,16 @@ runs:
       run: |
         sudo dpkg --add-architecture i386
         sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
+        sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main"
         sudo apt-get update
         sudo apt-get install -y libacl1-dev libncurses5-dev
         sudo apt-get install -y libacl1-dev:i386 libc6-dev-i386 libc6-dev-i386-cross libstdc++6-i386-cross gcc-multilib g++-multilib
-        sudo apt-get install -y clang-format-15 clang-tidy-15 clang-tools-15 clang-15 lld
+        sudo apt-get install -y clang-format-18 clang-tidy-18 clang-tools-18 clang-18 lld
         sudo rm /usr/bin/clang
         sudo rm /usr/bin/clang++
         sudo rm /usr/bin/clang-tidy
         sudo rm /usr/bin/clang-format
-        sudo ln -s /usr/bin/clang-15 /usr/bin/clang
-        sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
-        sudo ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy
-        sudo ln -s /usr/bin/clang-format-15 /usr/bin/clang-format
+        sudo ln -s /usr/bin/clang-18 /usr/bin/clang
+        sudo ln -s /usr/bin/clang++-18 /usr/bin/clang++
+        sudo ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
+        sudo ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
diff --git a/tools/scripts/clang_format.sh b/tools/scripts/clang_format.sh
@@ -29,7 +29,7 @@ fail() {
 hash git || fail "git not found"
 
 # Check if we have at least a specific clang-format version installed
-CLANG_FORMAT_VERSION=12
+CLANG_FORMAT_VERSION=18
 CLANG_FORMAT_CMD="clang-format-$CLANG_FORMAT_VERSION"
 if ! command -v $CLANG_FORMAT_CMD &> /dev/null
 then

diff --git a/tools/scripts/clang_tidy_check.sh b/tools/scripts/clang_tidy_check.sh
@@ -36,7 +36,7 @@ fail() {
     exit 1
 }
 
-CLANG_TIDY_VERSION=15
+CLANG_TIDY_VERSION=18
 CLANG_TIDY_CMD="clang-tidy-$CLANG_TIDY_VERSION"
 if ! command -v $CLANG_TIDY_CMD &> /dev/null
 then