From ec67a5c09fdc128b0228d5dbc12cf06f56a9d782 Mon Sep 17 00:00:00 2001 From: Kirill Azovtsev Date: Fri, 7 Jun 2024 20:00:44 +0300 Subject: [PATCH] change BUILD_THREADS for UBSAN step --- .github/workflows/test.yml | 4 +++- housekeeping/make_build.sh | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0236b01e31..adf2a9dc19 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -92,7 +92,9 @@ jobs: - name: "Self-hosted: Linux: gcc-12 TSAN WAVM" run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-12_cxx20.cmake -DTSAN=ON -DWASM_COMPILER=WAVM - name: "Self-hosted: Linux: clang-16 UBSAN" - run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-16_cxx20.cmake -DUBSAN=ON + run: | + export BUILD_THREADS=4 && + ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-16_cxx20.cmake -DUBSAN=ON - name: "Self-hosted: Linux: clang-16 External Project" run: ./housekeeping/make_external_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/clang-16_cxx20.cmake diff --git a/housekeeping/make_build.sh b/housekeeping/make_build.sh index 6f526d891c..1cfe3c89c4 100755 --- a/housekeeping/make_build.sh +++ b/housekeeping/make_build.sh @@ -5,6 +5,8 @@ # SPDX-License-Identifier: Apache-2.0 # +echo "env BUILD_THREADS=${BUILD_THREADS}" + BUILD_DIR="${BUILD_DIR:?BUILD_DIR variable is not defined}" BUILD_FINAL_TARGET="${BUILD_FINAL_TARGET:-test}" @@ -30,6 +32,8 @@ which git cd "$(dirname $0)/.." +echo "using BUILD_THREADS=${BUILD_THREADS}" + cmake . -B${BUILD_DIR} "$@" -DBACKWARD=OFF if [ "$BUILD_FINAL_TARGET" != "generated" ] ; then cmake --build "${BUILD_DIR}" -- -j${BUILD_THREADS}