From 1547277854b744bc06e471ccf21fb15b916aed36 Mon Sep 17 00:00:00 2001 From: Dave Kroezen Date: Wed, 14 Aug 2024 09:50:34 +0200 Subject: [PATCH 1/2] Install llvm repository for newer versions of clang-format --- industrial_ci/src/tests/clang_format_check.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/industrial_ci/src/tests/clang_format_check.sh b/industrial_ci/src/tests/clang_format_check.sh index ec2074860..b44442b4d 100644 --- a/industrial_ci/src/tests/clang_format_check.sh +++ b/industrial_ci/src/tests/clang_format_check.sh @@ -28,6 +28,16 @@ function run_clang_format_check() { local clang_format_executable="clang-format${CLANG_FORMAT_VERSION:+-$CLANG_FORMAT_VERSION}" ici_time_start install_clang_format + + # Install llvm repository to install the correct clang version if not supported by default on the distro + if ! apt-cache search --names-only "$clang_format_executable" | grep -q "clang"; then + ici_install_pkgs_for_command wget wget + ici_apt_install lsb-release software-properties-common gnupg + ici_cmd wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh + ici_cmd chmod +x /tmp/llvm.sh + ici_cmd /tmp/llvm.sh "$CLANG_FORMAT_VERSION" + fi + ici_apt_install git-core "$clang_format_executable" ici_time_end # install_clang_format From 1cc05280433c94110b7dfdc91122fd0cdf16380a Mon Sep 17 00:00:00 2001 From: Dave Kroezen Date: Tue, 22 Oct 2024 08:19:26 +0000 Subject: [PATCH 2/2] Run clang install command as root For containers that do not run as root --- industrial_ci/src/tests/clang_format_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/industrial_ci/src/tests/clang_format_check.sh b/industrial_ci/src/tests/clang_format_check.sh index b44442b4d..91ea28ac0 100644 --- a/industrial_ci/src/tests/clang_format_check.sh +++ b/industrial_ci/src/tests/clang_format_check.sh @@ -35,7 +35,7 @@ function run_clang_format_check() { ici_apt_install lsb-release software-properties-common gnupg ici_cmd wget -qO /tmp/llvm.sh https://apt.llvm.org/llvm.sh ici_cmd chmod +x /tmp/llvm.sh - ici_cmd /tmp/llvm.sh "$CLANG_FORMAT_VERSION" + ici_cmd ici_asroot /tmp/llvm.sh "$CLANG_FORMAT_VERSION" fi ici_apt_install git-core "$clang_format_executable"