From fa95e6cdc1c5f85b57b295e19f248f3db4187cfd Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Sat, 8 Nov 2025 09:39:02 +0100 Subject: [PATCH 1/2] ci: Use cmake --preset=dev-mode in test-each-commit task --- .github/ci-test-each-commit-exec.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/ci-test-each-commit-exec.py b/.github/ci-test-each-commit-exec.py index 959a1579aea..67534ec6fbd 100755 --- a/.github/ci-test-each-commit-exec.py +++ b/.github/ci-test-each-commit-exec.py @@ -37,13 +37,8 @@ def main(): "-DAPPEND_CFLAGS='-O3 -g2'", "-DCMAKE_BUILD_TYPE=Debug", "-DWERROR=ON", - "-DWITH_ZMQ=ON", - "-DBUILD_GUI=ON", - "-DBUILD_BENCH=ON", - "-DBUILD_FUZZ_BINARY=ON", - "-DWITH_USDT=ON", - "-DBUILD_KERNEL_LIB=ON", - "-DBUILD_KERNEL_TEST=ON", + "--preset=dev-mode", + # Tolerate unused member functions in intermediate commits in a pull request "-DCMAKE_CXX_FLAGS=-Wno-error=unused-member-function", ]) run(["cmake", "--build", "build", "-j", str(num_procs)]) From fa6db67369fbf9b9f0ec839b898edd7ba8bfe31a Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Sat, 8 Nov 2025 09:16:10 +0100 Subject: [PATCH 2/2] ci: [refactor] Extract build_dir constant in ci-test-each-commit-exec.py --- .github/ci-test-each-commit-exec.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/ci-test-each-commit-exec.py b/.github/ci-test-each-commit-exec.py index 67534ec6fbd..b81241bc20a 100755 --- a/.github/ci-test-each-commit-exec.py +++ b/.github/ci-test-each-commit-exec.py @@ -21,11 +21,12 @@ def main(): run(["git", "log", "-1"]) num_procs = int(run(["nproc"], stdout=subprocess.PIPE).stdout) + build_dir = "ci_build" run([ "cmake", "-B", - "build", + build_dir, "-Werror=dev", # Use clang++, because it is a bit faster and uses less memory than g++ "-DCMAKE_C_COMPILER=clang", @@ -41,19 +42,19 @@ def main(): # Tolerate unused member functions in intermediate commits in a pull request "-DCMAKE_CXX_FLAGS=-Wno-error=unused-member-function", ]) - run(["cmake", "--build", "build", "-j", str(num_procs)]) + run(["cmake", "--build", build_dir, "-j", str(num_procs)]) run([ "ctest", "--output-on-failure", "--stop-on-failure", "--test-dir", - "build", + build_dir, "-j", str(num_procs), ]) run([ sys.executable, - "./build/test/functional/test_runner.py", + f"./{build_dir}/test/functional/test_runner.py", "-j", str(num_procs * 2), "--combinedlogslen=99999999",