Update clang preparation script

nanocurrency · Jan 8, 2024 · 4407ad7 · 4407ad7
1 parent 44a4d1a
commit 4407ad7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
+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
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -euo pipefail
+set -euox pipefail
diff --git 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 \