mirror of https://github.com/bitcoin/bitcoin
Merge bitcoin/bitcoin#30841: ci: Post CMake-migration fixes and amendments
pull/30865/headc45186ca54
ci: Switch from `make` to `cmake --build` (Hennadii Stepanov)6e5f33af58
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 ACKc45186ca54
fanquake: ACKc45186ca54
Tree-SHA512: 2096f08c482ab9e10056cd4ec694ce40996243e2a1af2212dfff8cccbf0f51391d9a3dc396f7bba4f2877072a13a42bf667a02a44eab44e917aafb14d04e8e39
commit
f0eb63399a
@ -0,0 +1,11 @@
|
||||
# Copyright (c) 2024-present The Bitcoin Core developers
|
||||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or https://opensource.org/license/mit/.
|
||||
|
||||
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.26)
|
||||
set(log_files "CMakeFiles/CMakeConfigureLog.yaml")
|
||||
else()
|
||||
set(log_files "CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log")
|
||||
endif()
|
||||
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} -E echo ${log_files})
|
Loading…
Reference in new issue