From a020a1f96b57fb1b7be0f30ed647a724abd88aa6 Mon Sep 17 00:00:00 2001 From: alph00 Date: Fri, 28 Jun 2024 06:35:11 +0000 Subject: [PATCH] fix --- .github/workflows/build-core-spl-ut.yaml | 2 +- .github/workflows/build-core-withoutspl-ut.yaml | 2 +- scripts/gen_build_scripts.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-core-spl-ut.yaml b/.github/workflows/build-core-spl-ut.yaml index 7a0226479b..f669c051c3 100644 --- a/.github/workflows/build-core-spl-ut.yaml +++ b/.github/workflows/build-core-spl-ut.yaml @@ -74,7 +74,7 @@ jobs: ENABLE_STATIC_LINK_CRT: ON WITHOUTGDB: ON ONLY_SPL_UT: ON - MAKE_JOBS: 8 + MAKE_JOBS: 16 # BUILD_TYPE: Debug # TODO: Uncomment when memory management is refined run: make core diff --git a/.github/workflows/build-core-withoutspl-ut.yaml b/.github/workflows/build-core-withoutspl-ut.yaml index 4d45b57d39..3eb38e7a96 100644 --- a/.github/workflows/build-core-withoutspl-ut.yaml +++ b/.github/workflows/build-core-withoutspl-ut.yaml @@ -74,7 +74,7 @@ jobs: ENABLE_STATIC_LINK_CRT: ON WITHOUTGDB: ON WITHOUTSPL: ON - MAKE_JOBS: 8 + MAKE_JOBS: 16 # BUILD_TYPE: Debug # TODO: Uncomment when memory management is refined run: make core diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh index 33dfe2e92e..0455fc6fcb 100755 --- a/scripts/gen_build_scripts.sh +++ b/scripts/gen_build_scripts.sh @@ -38,6 +38,8 @@ BUILD_LOGTAIL_UT=${BUILD_LOGTAIL_UT:-OFF} ENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE:-OFF} ENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT:-OFF} WITHOUTGDB==${WITHOUTGDB:-OFF} +WITHOUTSPL=${WITHOUTSPL:-OFF} +ONLY_SPL_UT=${ONLY_SPL_UT:-OFF} BUILD_SCRIPT_FILE=$GENERATED_HOME/gen_build.sh COPY_SCRIPT_FILE=$GENERATED_HOME/gen_copy_docker.sh MAKE_JOBS=${MAKE_JOBS:-$(nproc)} @@ -82,7 +84,7 @@ EOF if [ $CATEGORY = "plugin" ]; then echo "mkdir -p core/build && cd core/build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLOGTAIL_VERSION=${VERSION} .. && cd plugin && make -s PluginAdapter && cd ../../.. && ./scripts/upgrade_adapter_lib.sh && ./scripts/plugin_build.sh mod c-shared ${OUT_DIR} ${VERSION} ${PLUGINS_CONFIG_FILE} ${GO_MOD_FILE}" >>$BUILD_SCRIPT_FILE elif [ $CATEGORY = "core" ]; then - echo "mkdir -p core/build && cd core/build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLOGTAIL_VERSION=${VERSION} -DBUILD_LOGTAIL=${BUILD_LOGTAIL} -DBUILD_LOGTAIL_UT=${BUILD_LOGTAIL_UT} -DENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE} -DENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT} -DWITHOUTGDB=${WITHOUTGDB} .. && make -sj${MAKE_JOBS}" >>$BUILD_SCRIPT_FILE + echo "mkdir -p core/build && cd core/build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLOGTAIL_VERSION=${VERSION} -DBUILD_LOGTAIL=${BUILD_LOGTAIL} -DBUILD_LOGTAIL_UT=${BUILD_LOGTAIL_UT} -DENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE} -DENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT} -DWITHOUTGDB=${WITHOUTGDB} -DWITHOUTSPL=${WITHOUTSPL} -DONLY_SPL_UT=${ONLY_SPL_UT} .. && make -sj${MAKE_JOBS}" >>$BUILD_SCRIPT_FILE elif [ $CATEGORY = "all" ]; then echo "mkdir -p core/build && cd core/build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLOGTAIL_VERSION=${VERSION} -DBUILD_LOGTAIL_UT=${BUILD_LOGTAIL_UT} -DENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE} -DENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT} -DWITHOUTGDB=${WITHOUTGDB} .. && make -sj\$nproc && cd - && ./scripts/upgrade_adapter_lib.sh && ./scripts/plugin_build.sh mod c-shared ${OUT_DIR} ${VERSION} ${PLUGINS_CONFIG_FILE} ${GO_MOD_FILE}" >>$BUILD_SCRIPT_FILE elif [ $CATEGORY = "e2e" ]; then