Skip to content

Commit 90710b3

Browse files
committed
ci: avoid making copies when collecting logs, misc. script fixes
1 parent 89d977d commit 90710b3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/dash/build_src.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
7777
"src/rpc/signmessage.cpp" \
7878
-p . "${MAKEJOBS}" \
7979
-- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_ROOT_DIR}/contrib/devtools/iwyu/bitcoin.core.imp" \
80-
|& tee "/tmp/iwyu_ci.out"
80+
2>&1 | tee "/tmp/iwyu_ci.out"
8181
cd src
8282
fix_includes.py --nosafe_headers < /tmp/iwyu_ci.out
8383
git --no-pager diff

ci/dash/slim-workspace.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TARGETS=(
3232
"build-ci/dashcore-${BUILD_TARGET}/src/qt/qrc_dash_locale.cpp"
3333
)
3434

35-
# Delete directories we don't need
35+
# Delete what we don't need
3636
for target in "${TARGETS[@]}"
3737
do
3838
if [[ -d "${target}" ]] || [[ -f "${target}" ]]; then

ci/dash/test_integrationtests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if [ "$BASEDIR" != "" ]; then
6666
for f in $LOGFILES; do
6767
d2="testlogs/$d/$(dirname "$f")"
6868
mkdir -p "$d2"
69-
cp "testdatadirs/$BASEDIR/$d/$f" "$d2/"
69+
mv "testdatadirs/$BASEDIR/$d/$f" "$d2/"
7070
done
7171
done
7272
fi

0 commit comments

Comments
 (0)