From 27d9763b1b76d96d936628df72f9e5aef5b1718a Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Tue, 19 Nov 2024 08:20:56 +0000 Subject: [PATCH] fix: add `linux64_multiprocess` `BUILD_TARGET` to matrix, mend C(XX) --- .gitlab-ci.yml | 2 +- ci/dash/matrix.sh | 2 ++ ci/test/00_setup_env_native_multiprocess.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c612899f73..27fc871dd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,7 +213,7 @@ x86_64-pc-linux-gnu_multiprocess: - .skip-in-fast-mode-template variables: HOST: x86_64-pc-linux-gnu - DEP_OPTS: "MULTIPROCESS=1" + DEP_OPTS: "DEBUG=1 MULTIPROCESS=1" x86_64-apple-darwin: extends: diff --git a/ci/dash/matrix.sh b/ci/dash/matrix.sh index 6eeb2a7565..9822a72789 100755 --- a/ci/dash/matrix.sh +++ b/ci/dash/matrix.sh @@ -26,6 +26,8 @@ elif [ "$BUILD_TARGET" = "linux64_cxx20" ]; then source ./ci/test/00_setup_env_native_cxx20.sh elif [ "$BUILD_TARGET" = "linux64_fuzz" ]; then source ./ci/test/00_setup_env_native_fuzz.sh +elif [ "$BUILD_TARGET" = "linux64_multiprocess" ]; then + source ./ci/test/00_setup_env_native_multiprocess.sh elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then source ./ci/test/00_setup_env_native_nowallet.sh elif [ "$BUILD_TARGET" = "linux64_sqlite" ]; then diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh index 7029ea5395..d23fae22b5 100755 --- a/ci/test/00_setup_env_native_multiprocess.sh +++ b/ci/test/00_setup_env_native_multiprocess.sh @@ -11,5 +11,5 @@ export PACKAGES="cmake python3 llvm clang" export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" export GOAL="install" export TEST_RUNNER_EXTRA="--v2transport" -export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM +export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-16 CXX=clang++-16" # Use clang to avoid OOM export BITCOIND=dash-node # Used in functional tests