Skip to content

Commit 6e5f33a

Browse files
committed
ci: Handle log files regardless of CMake's version
1 parent a5fa907 commit 6e5f33a

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

ci/test/03_test_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ if [[ "${RUN_TIDY}" == "true" ]]; then
121121
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
122122
fi
123123

124-
bash -c "cmake -S $BASE_ROOT_DIR $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (cat CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log) && false)"
124+
bash -c "cmake -S $BASE_ROOT_DIR $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (cat $(cmake -P "${BASE_ROOT_DIR}/ci/test/GetCMakeLogFiles.cmake")) && false)"
125125

126126
bash -c "make $MAKEJOBS all $GOAL" || ( echo "Build failure. Verbose build follows." && make all "$GOAL" V=1 ; false )
127127

ci/test/GetCMakeLogFiles.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright (c) 2024-present The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or https://opensource.org/license/mit/.
4+
5+
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.26)
6+
set(log_files "CMakeFiles/CMakeConfigureLog.yaml")
7+
else()
8+
set(log_files "CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log")
9+
endif()
10+
11+
execute_process(COMMAND ${CMAKE_COMMAND} -E echo ${log_files})

0 commit comments

Comments
 (0)