Skip to content

Commit aba9024

Browse files
committed
Merge bitcoin/bitcoin#29659: ci: Bump TIDY_LLVM_V
636c986 ci: Bump `TIDY_LLVM_V` (Hennadii Stepanov) Pull request description: This PR switches to the latest [IWYU 0.22](https://github.com/include-what-you-use/include-what-you-use/releases/tag/0.22), which is compatible with Clang 18. ACKs for top commit: fanquake: ACK 636c986 Tree-SHA512: 78ce89244c5e487dd1be8b4bd2ca6f06d19b04b78289ebc21985110574053545dcce5eb622edf2bede2cf7bb58360170e976d30a4484a127d34dd17b1c604e9c
2 parents 7af95af + 636c986 commit aba9024

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

ci/test/00_setup_env_native_tidy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_tidy
11-
export TIDY_LLVM_V="17"
11+
export TIDY_LLVM_V="18"
1212
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 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"
1313
export NO_DEPENDS=1
1414
export RUN_UNIT_TESTS=false

src/.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ modernize-use-noexcept,
1212
modernize-use-nullptr,
1313
performance-*,
1414
-performance-avoid-endl,
15+
-performance-enum-size,
1516
-performance-inefficient-string-concatenation,
1617
-performance-no-int-to-ptr,
1718
-performance-noexcept-move-constructor,

src/script/signingprovider.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ TaprootBuilder& TaprootBuilder::Add(int depth, Span<const unsigned char> script,
370370
/* Construct NodeInfo object with leaf hash and (if track is true) also leaf information. */
371371
NodeInfo node;
372372
node.hash = ComputeTapleafHash(leaf_version, script);
373-
// due to bug in clang-tidy-17:
374-
// NOLINTNEXTLINE(modernize-use-emplace)
375373
if (track) node.leaves.emplace_back(LeafInfo{std::vector<unsigned char>(script.begin(), script.end()), leaf_version, {}});
376374
/* Insert into the branch. */
377375
Insert(std::move(node), depth);

0 commit comments

Comments
 (0)