Skip to content

Commit d86a83d

Browse files
committed
lint: drop DIR_IWYU global
1 parent da3816e commit d86a83d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ci/test/00_setup_env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
6767
# The folder for previous release binaries.
6868
# This folder exists only on the ci guest, and on the ci host as a volume.
6969
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/releases/$HOST}
70-
export DIR_IWYU="${BASE_SCRATCH_DIR}/iwyu"
7170
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
7271
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}
7372
export GOAL=${GOAL:-install}

ci/test/01_base_install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
7272
fi
7373

7474
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"
7878
fi
7979

8080
mkdir -p "${DEPENDS_DIR}/SDKs" "${DEPENDS_DIR}/sdk-sources"

ci/test/06_script_b.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ if [ "${RUN_TIDY}" = "true" ]; then
158158
jq 'map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$") | not))' ../compile_commands.json > tmp.json
159159
mv tmp.json ../compile_commands.json
160160
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" \
162162
-p . "${MAKEJOBS}" \
163163
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
164164
-Xiwyu --max_line_length=160 \
165165
2>&1 | tee /tmp/iwyu_ci.out
166166
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
168168
git --no-pager diff
169169
fi
170170

0 commit comments

Comments
 (0)