File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,6 @@ export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
67
67
# The folder for previous release binaries.
68
68
# This folder exists only on the ci guest, and on the ci host as a volume.
69
69
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:- $BASE_ROOT_DIR / releases/ $HOST }
70
- export DIR_IWYU=" ${BASE_SCRATCH_DIR} /iwyu"
71
70
export SDK_URL=${SDK_URL:- https:// bitcoincore.org/ depends-sources/ sdks}
72
71
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:- build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison}
73
72
export GOAL=${GOAL:- install}
Original file line number Diff line number Diff line change @@ -72,9 +72,9 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
72
72
fi
73
73
74
74
if [[ " ${RUN_TIDY} " == " true" ]]; then
75
- git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_16 " ${DIR_IWYU} " /include-what-you-use
76
- cmake -B " ${DIR_IWYU} " / build/ -G ' Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-16 -S " ${DIR_IWYU} " /include-what-you-use
77
- make -C " ${DIR_IWYU} " / build/ install " $MAKEJOBS "
75
+ git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_16 /include-what-you-use
76
+ cmake -B /iwyu- build/ -G ' Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-16 -S /include-what-you-use
77
+ make -C /iwyu- build/ install " $MAKEJOBS "
78
78
fi
79
79
80
80
mkdir -p " ${DEPENDS_DIR} /SDKs" " ${DEPENDS_DIR} /sdk-sources"
Original file line number Diff line number Diff line change @@ -158,13 +158,13 @@ if [ "${RUN_TIDY}" = "true" ]; then
158
158
jq ' map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$") | not))' ../compile_commands.json > tmp.json
159
159
mv tmp.json ../compile_commands.json
160
160
cd " ${BASE_BUILD_DIR} /bitcoin-$HOST /"
161
- python3 " ${DIR_IWYU} /include-what-you-use/iwyu_tool.py" \
161
+ python3 " /include-what-you-use/iwyu_tool.py" \
162
162
-p . " ${MAKEJOBS} " \
163
163
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file=" ${BASE_BUILD_DIR} /bitcoin-$HOST /contrib/devtools/iwyu/bitcoin.core.imp" \
164
164
-Xiwyu --max_line_length=160 \
165
165
2>&1 | tee /tmp/iwyu_ci.out
166
166
cd " ${BASE_ROOT_DIR} /src"
167
- python3 " ${DIR_IWYU} /include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
167
+ python3 " /include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
168
168
git --no-pager diff
169
169
fi
170
170
You can’t perform that action at this time.
0 commit comments