From 04ce80b1e1de800d6f06302bc006b6cbaa5631af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:04:55 +0100 Subject: [PATCH] Update clang preparation script --- ci/prepare/linux/prepare-clang.sh | 7 +++++-- ci/prepare/linux/prepare-gcc.sh | 2 +- ci/prepare/linux/prepare.sh | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/prepare/linux/prepare-clang.sh b/ci/prepare/linux/prepare-clang.sh index 16636b0b3f..ce35402e2e 100755 --- a/ci/prepare/linux/prepare-clang.sh +++ b/ci/prepare/linux/prepare-clang.sh @@ -1,5 +1,8 @@ #!/bin/bash -set -euo pipefail +set -euox pipefail + +# Clang installer dependencies +DEBIAN_FRONTEND=noninteractive apt-get install -yqq lsb-release software-properties-common gnupg CLANG_VERSION=16 @@ -12,4 +15,4 @@ update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-$CLANG_VERSION 10 # Workaround to get a path that can be easily passed into cmake for BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE # See https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 -backtrace_file=$(find /usr/lib/gcc/ -name 'backtrace.h' | head -n 1) && test -f $backtrace_file && ln -s $backtrace_file /tmp/backtrace.h \ No newline at end of file +backtrace_file=$(find /usr/lib/gcc/ -name 'backtrace.h' | head -n 1) && test -f $backtrace_file && ln -s $backtrace_file /tmp/backtrace.h diff --git a/ci/prepare/linux/prepare-gcc.sh b/ci/prepare/linux/prepare-gcc.sh index 2a9b97a5a3..d06a2644c3 100755 --- a/ci/prepare/linux/prepare-gcc.sh +++ b/ci/prepare/linux/prepare-gcc.sh @@ -1,2 +1,2 @@ #!/bin/bash -set -euo pipefail \ No newline at end of file +set -euox pipefail \ No newline at end of file diff --git a/ci/prepare/linux/prepare.sh b/ci/prepare/linux/prepare.sh index 2ed1a8f545..f63da28e8d 100755 --- a/ci/prepare/linux/prepare.sh +++ b/ci/prepare/linux/prepare.sh @@ -6,11 +6,12 @@ COMPILER=${COMPILER:-gcc} echo "Compiler: '${COMPILER}'" # Common dependencies needed for building & testing -apt-get update -qq +DEBIAN_FRONTEND=noninteractive apt-get update -qq DEBIAN_FRONTEND=noninteractive apt-get install -yqq \ build-essential \ g++ \ +curl \ wget \ python3 \ zlib1g-dev \