Skip to content

Commit fabe90c

Browse files
author
MarcoFalke
committed
ci: Use clang-19 from apt.llvm.org
1 parent 1c7ca6e commit fabe90c

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

ci/test/00_setup_env_native_asan.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ else
1919
fi
2020

2121
export CONTAINER_NAME=ci_native_asan
22-
export PACKAGES="systemtap-sdt-dev clang-18 llvm-18 libclang-rt-18-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
22+
export APT_LLVM_V="19"
23+
export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
2324
export NO_DEPENDS=1
2425
export GOAL="install"
2526
export BITCOIN_CONFIG="\
2627
-DWITH_USDT=ON -DWITH_ZMQ=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF -DBUILD_GUI=ON \
2728
-DSANITIZERS=address,float-divide-by-zero,integer,undefined \
28-
-DCMAKE_C_COMPILER=clang-18 \
29-
-DCMAKE_CXX_COMPILER=clang++-18 \
29+
-DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
30+
-DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
3031
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
3132
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern -Wno-error=deprecated-declarations' \
3233
-DAPPEND_CXXFLAGS='-std=c++23' \

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz
11-
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libevent-dev libboost-dev libsqlite3-dev"
11+
export APT_LLVM_V="19"
12+
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libevent-dev libboost-dev libsqlite3-dev"
1213
export NO_DEPENDS=1
1314
export RUN_UNIT_TESTS=false
1415
export RUN_FUNCTIONAL_TESTS=false
@@ -18,9 +19,9 @@ export CI_CONTAINER_CAP="--cap-add SYS_PTRACE" # If run with (ASan + LSan), the
1819
export BITCOIN_CONFIG="\
1920
-DBUILD_FOR_FUZZING=ON \
2021
-DSANITIZERS=fuzzer,address,undefined,float-divide-by-zero,integer \
21-
-DCMAKE_C_COMPILER=clang-18 \
22-
-DCMAKE_CXX_COMPILER=clang++-18 \
22+
-DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
23+
-DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
2324
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
2425
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern' \
2526
"
26-
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-18"
27+
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-${APT_LLVM_V}"

ci/test/00_setup_env_native_tsan.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
1010
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
11-
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
12-
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
11+
export APT_LLVM_V="19"
12+
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libc++abi-${APT_LLVM_V}-dev libc++-${APT_LLVM_V}-dev python3-zmq"
13+
export DEP_OPTS="CC=clang-${APT_LLVM_V} CXX='clang++-${APT_LLVM_V} -stdlib=libc++'"
1314
export GOAL="install"
1415
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DSANITIZERS=thread \
1516
-DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES'"

ci/test/01_base_install.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
2121
dpkg --add-architecture "$DPKG_ADD_ARCH"
2222
fi
2323

24+
if [ -n "${APT_LLVM_V}" ]; then
25+
${CI_RETRY_EXE} apt-get update
26+
${CI_RETRY_EXE} apt-get install curl -y
27+
curl "https://apt.llvm.org/llvm-snapshot.gpg.key" | tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc"
28+
(
29+
# shellcheck disable=SC2034
30+
source /etc/os-release
31+
echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${APT_LLVM_V} main" > "/etc/apt/sources.list.d/llvm-toolchain-${VERSION_CODENAME}-${APT_LLVM_V}.list"
32+
)
33+
fi
34+
2435
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
2536
bash -c "dnf -y install epel-release"
2637
bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"

0 commit comments

Comments
 (0)