Skip to content

Commit f0eb633

Browse files
committed
Merge bitcoin/bitcoin#30841: ci: Post CMake-migration fixes and amendments
c45186c ci: Switch from `make` to `cmake --build` (Hennadii Stepanov) 6e5f33a ci: Handle log files regardless of CMake's version (Hennadii Stepanov) Pull request description: This PR addresses the change in logging that [happened](https://cmake.org/cmake/help/latest/release/3.26.html#configure-log) in CMake 3.26. Additionally, the `make` invocation replaced with `cmake --build`. Here are examples of the CI logs: - for a an error during the build system generation: https://cirrus-ci.com/build/5210987156996096 - for a compiler error: https://cirrus-ci.com/build/4617660913156096 ACKs for top commit: maflcko: review ACK c45186c fanquake: ACK c45186c Tree-SHA512: 2096f08c482ab9e10056cd4ec694ce40996243e2a1af2212dfff8cccbf0f51391d9a3dc396f7bba4f2877072a13a42bf667a02a44eab44e917aafb14d04e8e39
2 parents 1559637 + c45186c commit f0eb633

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

ci/test/03_test_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ 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

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

128128
bash -c "${PRINT_CCACHE_STATISTICS}"
129129
du -sh "${DEPENDS_DIR}"/*/

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)