Skip to content

Commit f5f951d

Browse files
committed
Merge #205: cmake: Fix "tidy" CI job
de15de4 fixup! ci: Migrate CI scripts to CMake (Hennadii Stepanov) e59e96d fixup! ci: Migrate CI scripts to CMake (Hennadii Stepanov) Pull request description: Fixes the first point from bitcoin#29790 (comment): > 1. `Cannot open mapping file '/ci_container_base/ci/scratch/build-/contrib/devtools/iwyu/bitcoin.core.imp': No such file or directory.` Top commit has no ACKs. Tree-SHA512: ebead6da2729620237703d05b6cbf9b5ad73f139a9020f3785f0c9e89054fbaddd4c5ae687278042c6b467359a2e0e641f09d5f3d5c37429a558f508832c6f2d
2 parents 6c2be70 + de15de4 commit f5f951d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci/test/00_setup_env.sh

-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
6161
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
6262
# Folder where the build result is put (bin and lib).
6363
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
64-
# Folder where the build is done (dist and out-of-tree build).
65-
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
6664
# The folder for previous release binaries.
6765
# This folder exists only on the ci guest, and on the ci host as a volume.
6866
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases}

ci/test/03_test_script.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ fi
110110
ccache --zero-stats
111111
PRINT_CCACHE_STATISTICS="ccache --version | head -n 1 && ccache --show-stats"
112112

113+
# Folder where the build is done.
114+
BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
113115
mkdir -p "${BASE_BUILD_DIR}"
114116
cd "${BASE_BUILD_DIR}"
115117

@@ -178,7 +180,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
178180
cd "${BASE_ROOT_DIR}"
179181
python3 "/include-what-you-use/iwyu_tool.py" \
180182
-p "${BASE_BUILD_DIR}" "${MAKEJOBS}" \
181-
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
183+
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
182184
-Xiwyu --max_line_length=160 \
183185
2>&1 | tee /tmp/iwyu_ci.out
184186
cd "${BASE_ROOT_DIR}/src"

0 commit comments

Comments
 (0)