File tree Expand file tree Collapse file tree 4 files changed +10
-7
lines changed Expand file tree Collapse file tree 4 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -8,12 +8,13 @@ export LC_ALL=C.UTF-8
8
8
9
9
export CI_IMAGE_NAME_TAG=" docker.io/ubuntu:23.10" # This version will reach EOL in Jul 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
10
10
export CONTAINER_NAME=ci_native_tidy
11
- export PACKAGES=" clang-16 libclang-16-dev llvm-16-dev libomp-16-dev clang-tidy-16 jq 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 TIDY_LLVM_V=" 17"
12
+ export PACKAGES=" clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V} -dev llvm-${TIDY_LLVM_V} -dev libomp-${TIDY_LLVM_V} -dev clang-tidy-${TIDY_LLVM_V} jq 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
13
export NO_DEPENDS=1
13
14
export RUN_UNIT_TESTS=false
14
15
export RUN_FUNCTIONAL_TESTS=false
15
16
export RUN_FUZZ_TESTS=false
16
17
export RUN_TIDY=true
17
18
export GOAL=" install"
18
- export BITCOIN_CONFIG=" CC=clang-16 CXX=clang++-16 --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -I/usr/lib/llvm-16 /lib/clang/16 /include'"
19
+ export BITCOIN_CONFIG=" CC=clang-${TIDY_LLVM_V} CXX=clang++-${TIDY_LLVM_V} --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -I/usr/lib/llvm-${TIDY_LLVM_V} /lib/clang/${TIDY_LLVM_V} /include'"
19
20
export CCACHE_MAXSIZE=200M
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ if [ -n "$PIP_PACKAGES" ]; then
42
42
fi
43
43
44
44
if [[ ${USE_MEMORY_SANITIZER} == " true" ]]; then
45
- git clone --depth=1 https://github.com/llvm/llvm-project -b " llvmorg-17.0.0-rc4 " /msan/llvm-project
45
+ ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-17.0.2 /msan/llvm-project
46
46
47
47
cmake -G Ninja -B /msan/clang_build/ \
48
48
-DLLVM_ENABLE_PROJECTS=" clang" \
@@ -73,8 +73,9 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
73
73
fi
74
74
75
75
if [[ " ${RUN_TIDY} " == " true" ]]; then
76
- git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_16 /include-what-you-use
77
- cmake -B /iwyu-build/ -G ' Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-16 -S /include-what-you-use
76
+ ${CI_RETRY_EXE} git clone https://github.com/include-what-you-use/include-what-you-use -b master /include-what-you-use
77
+ git -C /include-what-you-use checkout a138eaac254e5a472464e31d5ec418fe6e6f1fc7
78
+ cmake -B /iwyu-build/ -G ' Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-" ${TIDY_LLVM_V} " -S /include-what-you-use
78
79
make -C /iwyu-build/ install " -j$( nproc ) " # Use nproc, because MAKEJOBS is the default in docker image builds
79
80
fi
80
81
Original file line number Diff line number Diff line change @@ -175,13 +175,13 @@ if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
175
175
fi
176
176
177
177
if [ " ${RUN_TIDY} " = " true" ]; then
178
- cmake -B /tidy-build -DLLVM_DIR=/usr/lib/llvm-16 /cmake -DCMAKE_BUILD_TYPE=Release -S " ${BASE_ROOT_DIR} " /contrib/devtools/bitcoin-tidy
178
+ cmake -B /tidy-build -DLLVM_DIR=/usr/lib/llvm-" ${TIDY_LLVM_V} " /cmake -DCMAKE_BUILD_TYPE=Release -S " ${BASE_ROOT_DIR} " /contrib/devtools/bitcoin-tidy
179
179
cmake --build /tidy-build " $MAKEJOBS "
180
180
cmake --build /tidy-build --target bitcoin-tidy-tests " $MAKEJOBS "
181
181
182
182
set -eo pipefail
183
183
cd " ${BASE_BUILD_DIR} /bitcoin-$HOST /src/"
184
- ( run-clang-tidy-16 -quiet -load=" /tidy-build/libbitcoin-tidy.so" " ${MAKEJOBS} " ) | grep -C5 " error"
184
+ ( run-clang-tidy-" ${TIDY_LLVM_V} " -quiet -load=" /tidy-build/libbitcoin-tidy.so" " ${MAKEJOBS} " ) | grep -C5 " error"
185
185
# Filter out files by regex here, because regex may not be
186
186
# accepted in src/.bear-tidy-config
187
187
# Filter out:
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ modernize-use-default-member-init,
8
8
modernize-use-noexcept,
9
9
modernize-use-nullptr,
10
10
performance-*,
11
+ -performance-avoid-endl,
11
12
-performance-inefficient-string-concatenation,
12
13
-performance-no-int-to-ptr,
13
14
-performance-noexcept-move-constructor,
You can’t perform that action at this time.
0 commit comments