diff options
| author | fanquake <fanquake@gmail.com> | 2022-04-30 09:58:09 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-30 09:58:29 +0100 |
| commit | c086ebaf74a8f16ab5a175ce9b625770dee0fe9a (patch) | |
| tree | 15787398736bbb32b3b558e711bc06e789d969a1 | |
| parent | becea48fe07287d395560048f55aa61bf10888f4 (diff) | |
| parent | fa847ed2f698a8a999352aeed63baf60b094e662 (diff) | |
| download | bitcoin-c086ebaf74a8f16ab5a175ce9b625770dee0fe9a.tar.xz | |
Merge bitcoin/bitcoin#25028: ci: Clone iwyu only if missing
fa847ed2f698a8a999352aeed63baf60b094e662 ci: Clone iwyu only if missing (MacroFake)
Pull request description:
This doesn't change anything for Cirrus CI, but makes it easier to play locally.
For reference, the same check is done when cloning `DIR_FUZZ_IN`.
ACKs for top commit:
fanquake:
ACK fa847ed2f698a8a999352aeed63baf60b094e662
Tree-SHA512: 3d9689ea85b2380dcf83d26997c89c63f163aebfae9530180cb2420872a9f30d7b3dc59722e2e49684fdb3e30859b1e08e1272f6d083c07f213e9f5a190ca21f
| -rwxr-xr-x | ci/test/04_install.sh | 11 | ||||
| -rwxr-xr-x | ci/test/06_script_b.sh | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 227bdf3319..453a34ca78 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -112,10 +112,13 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then fi if [[ "${RUN_TIDY}" == "true" ]]; then - CI_EXEC "mkdir -p ${BASE_SCRATCH_DIR}/iwyu/build/" - CI_EXEC "git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_14 ${BASE_SCRATCH_DIR}/iwyu/include-what-you-use" - CI_EXEC "cd ${BASE_SCRATCH_DIR}/iwyu/build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-14 ../include-what-you-use" - CI_EXEC "cd ${BASE_SCRATCH_DIR}/iwyu/build && make install $MAKEJOBS" + export DIR_IWYU="${BASE_SCRATCH_DIR}/iwyu" + if [ ! -d "${DIR_IWYU}" ]; then + CI_EXEC "mkdir -p ${DIR_IWYU}/build/" + 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" + CI_EXEC "cd ${DIR_IWYU}/build && cmake -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-14 ../include-what-you-use" + CI_EXEC "cd ${DIR_IWYU}/build && make install $MAKEJOBS" + fi fi if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index 40547f19ef..d634875d40 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -38,7 +38,7 @@ if [ "${RUN_TIDY}" = "true" ]; then export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST/src/" CI_EXEC run-clang-tidy "${MAKEJOBS}" export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST/" - CI_EXEC "python3 ${BASE_SCRATCH_DIR}/iwyu/include-what-you-use/iwyu_tool.py"\ + CI_EXEC "python3 ${DIR_IWYU}/include-what-you-use/iwyu_tool.py"\ " src/compat"\ " src/init"\ " src/rpc/signmessage.cpp"\ |