File tree 4 files changed +8
-8
lines changed
4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -80,10 +80,10 @@ task:
80
80
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
81
81
82
82
task :
83
- name : ' tidy [jammy ]'
83
+ name : ' tidy [bookworm ]'
84
84
<< : *GLOBAL_TASK_TEMPLATE
85
85
container :
86
- image : ubuntu:jammy
86
+ image : debian:bookworm
87
87
cpu : 2
88
88
memory : 5G
89
89
# For faster CI feedback, immediately schedule the linters
Original file line number Diff line number Diff line change 6
6
7
7
export LC_ALL=C.UTF-8
8
8
9
- export CI_IMAGE_NAME_TAG=" ubuntu:22.04 "
9
+ export CI_IMAGE_NAME_TAG=" debian:bookworm "
10
10
export CONTAINER_NAME=ci_native_tidy
11
- export PACKAGES=" clang libclang-dev llvm-dev clang-tidy bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
11
+ export PACKAGES=" clang-15 libclang-15- dev llvm-15- dev clang-tidy-15 bear cmake libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
12
12
export NO_DEPENDS=1
13
13
export RUN_UNIT_TESTS=false
14
14
export RUN_FUNCTIONAL_TESTS=false
15
15
export RUN_FUZZ_TESTS=false
16
16
export RUN_TIDY=true
17
17
export GOAL=" install"
18
- export BITCOIN_CONFIG=" CC=clang CXX=clang++ --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0'"
18
+ export BITCOIN_CONFIG=" CC=clang-15 CXX=clang++-15 --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0'"
19
19
export CCACHE_SIZE=200M
Original file line number Diff line number Diff line change @@ -135,8 +135,8 @@ if [[ "${RUN_TIDY}" == "true" ]]; then
135
135
export DIR_IWYU=" ${BASE_SCRATCH_DIR} /iwyu"
136
136
if [ ! -d " ${DIR_IWYU} " ]; then
137
137
CI_EXEC " mkdir -p ${DIR_IWYU} /build/"
138
- CI_EXEC " git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_14 ${DIR_IWYU} /include-what-you-use"
139
- CI_EXEC " cd ${DIR_IWYU} /build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-14 ../include-what-you-use"
138
+ CI_EXEC " git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_15 ${DIR_IWYU} /include-what-you-use"
139
+ CI_EXEC " cd ${DIR_IWYU} /build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-15 ../include-what-you-use"
140
140
CI_EXEC_ROOT " cd ${DIR_IWYU} /build && make install $MAKEJOBS "
141
141
fi
142
142
fi
Original file line number Diff line number Diff line change 39
39
if [ " ${RUN_TIDY} " = " true" ]; then
40
40
set -eo pipefail
41
41
export P_CI_DIR=" ${BASE_BUILD_DIR} /bitcoin-$HOST /src/"
42
- ( CI_EXEC run-clang-tidy -quiet " ${MAKEJOBS} " ) | grep -C5 " error"
42
+ ( CI_EXEC run-clang-tidy-15 -quiet " ${MAKEJOBS} " ) | grep -C5 " error"
43
43
export P_CI_DIR=" ${BASE_BUILD_DIR} /bitcoin-$HOST /"
44
44
CI_EXEC " python3 ${DIR_IWYU} /include-what-you-use/iwyu_tool.py" \
45
45
" src/common/init.cpp" \
You can’t perform that action at this time.
0 commit comments