Skip to content

Commit c2028f9

Browse files
committed
Merge bitcoin/bitcoin#27012: ci: Print iwyu patch in git diff format
fa6986a ci: Print iwyu patch in git diff format (MarcoFalke) Pull request description: Seems more dev friendly to also have a patch to copy-paste ACKs for top commit: hebasto: ACK fa6986a, tested on Ubuntu 22.04 locally. fanquake: ACK fa6986a - did not test but example CI output looks ok. stickies-v: utACK fa6986a Tree-SHA512: 7cfd8584bf12e03c28af23f4712c6bcafd648d87ddb92788b9cd35455b2db49f4bd4aef8ad4711f75c7f11ad2bb2492c2eb6044007086c20e36016575c060603
2 parents b3ef329 + fa6986a commit c2028f9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ci/test/06_script_b.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ if [ "${RUN_TIDY}" = "true" ]; then
7575
" src/util/syserror.cpp"\
7676
" src/util/threadinterrupt.cpp"\
7777
" src/zmq"\
78-
" -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"
78+
" -p . ${MAKEJOBS}"\
79+
" -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"\
80+
" |& tee /tmp/iwyu_ci.out"
81+
export P_CI_DIR="${BASE_ROOT_DIR}/src"
82+
CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out"
83+
CI_EXEC "git --no-pager diff"
7984
fi
8085

8186
if [ "$RUN_SECURITY_TESTS" = "true" ]; then

0 commit comments

Comments
 (0)