Skip to content

Commit 1232c2f

Browse files
committed
ci: use LLVM/clang-16 in native_asan job
Similar to #27298.
1 parent 8a373a5 commit 1232c2f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.cirrus.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,9 @@ task:
269269
# Images can be found here: https://cloud.google.com/compute/docs/images/os-details
270270
compute_engine_instance:
271271
image_project: ubuntu-os-cloud
272-
image: family/ubuntu-2204-lts # when upgrading, check if we can drop "ADD_UNTRUSTED_BPFCC_PPA"
272+
image: family/ubuntu-2304-amd64 # https://cirrus-ci.org/guide/custom-vms/#custom-compute-engine-vms
273273
cpu: 4
274+
disk: 100
274275
memory: 12G
275276
env:
276277
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

ci/test/00_setup_env_native_asan.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ else
1919
fi
2020

2121
export CONTAINER_NAME=ci_native_asan
22-
export PACKAGES="systemtap-sdt-dev clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
23-
export CI_IMAGE_NAME_TAG=ubuntu:22.04
22+
export PACKAGES="systemtap-sdt-dev clang-16 llvm-16 libclang-rt-16-dev python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
23+
export CI_IMAGE_NAME_TAG=ubuntu:23.04 # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
2424
export NO_DEPENDS=1
2525
export GOAL="install"
26-
export BITCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=address,integer,undefined CC=clang CXX=clang++"
26+
export BITCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=address,integer,undefined CC=clang-16 CXX=clang++-16"

0 commit comments

Comments
 (0)