diff options
| author | Maxim Yurchuk <maxim.yurchuk@gmail.com> | 2023-09-05 20:33:14 +0300 |
|---|---|---|
| committer | nkozlovskiy <nmk@ydb.tech> | 2023-09-05 20:53:37 +0300 |
| commit | 7f49777e035ecdc4243dd39ee7b4891cb1297a4e (patch) | |
| tree | 66c333ce1ae0e7dfd52bcdc5a203b4f26134bd33 /.github | |
| parent | e44f767cdb56be8e8daafa4f844ab99a228affb0 (diff) | |
| download | ydb-7f49777e035ecdc4243dd39ee7b4891cb1297a4e.tar.gz | |
Simplify cmake build
Simplify cmake build
Pull Request resolved: #352
Diffstat (limited to '.github')
| -rw-r--r-- | .github/actions/build/action.yml | 14 | ||||
| -rw-r--r-- | .github/prewarm/build.sh | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 3ba0b7c31d..c3a56b3b95 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -26,10 +26,10 @@ runs: export CC=/usr/bin/clang-14 export CC_FOR_BUILD=$CC cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=/usr/local/bin/ccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache \ + -DCCACHE_PATH=/usr/local/bin/ccache \ -DCMAKE_TOOLCHAIN_FILE=../ydb/clang.toolchain \ - -DCMAKE_CXX_FLAGS="-fsanitize=${{ inputs.sanitizer }} -g -gsplit-dwarf -gz -fno-omit-frame-pointer -UNDEBUG ${{ inputs.extra_compile_flags }}" \ - -DCMAKE_C_FLAGS="-fsanitize=${{ inputs.sanitizer }} -g -gsplit-dwarf -gz -fno-omit-frame-pointer -UNDEBUG ${{ inputs.extra_compile_flags }}" \ + -DCMAKE_CXX_FLAGS="-fsanitize=${{ inputs.sanitizer }} -g -gsplit-dwarf -gz -fno-omit-frame-pointer ${{ inputs.extra_compile_flags }}" \ + -DCMAKE_C_FLAGS="-fsanitize=${{ inputs.sanitizer }} -g -gsplit-dwarf -gz -fno-omit-frame-pointer ${{ inputs.extra_compile_flags }}" \ ../ydb - name: Configure shell: bash @@ -45,12 +45,10 @@ runs: # FIXME: set DCMAKE_CXX_FLAGS_RELWITHDEBINFO and DCMAKE_CXX_FLAGS bacause of global_flags.cmake flags override. cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=/usr/local/bin/ccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache \ + -DCCACHE_PATH=/usr/local/bin/ccache \ -DCMAKE_TOOLCHAIN_FILE=../ydb/clang.toolchain \ - -DCMAKE_C_FLAGS="-O2 -UNDEBUG ${{ inputs.extra_compile_flags }}" \ - -DCMAKE_CXX_FLAGS="-O2 -UNDEBUG ${{ inputs.extra_compile_flags }}" \ - -DCMAKE_C_FLAGS_RELEASE="-O2 -UNDEBUG ${{ inputs.extra_compile_flags }}" \ - -DCMAKE_CXX_FLAGS_RELEASE="-O2 -UNDEBUG ${{ inputs.extra_compile_flags }}" \ + -DCMAKE_C_FLAGS="${{ inputs.extra_compile_flags }}" \ + -DCMAKE_CXX_FLAGS="${{ inputs.extra_compile_flags }}" \ ../ydb - name: Build shell: bash diff --git a/.github/prewarm/build.sh b/.github/prewarm/build.sh index 2bc01d9896..8779edad0f 100644 --- a/.github/prewarm/build.sh +++ b/.github/prewarm/build.sh @@ -14,10 +14,8 @@ cd /ydbwork/build echo "::group::cmake" cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ --DCMAKE_C_COMPILER_LAUNCHER=/usr/local/bin/ccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache \ +-DCCACHE_PATH=/usr/local/bin/ccache \ -DCMAKE_TOOLCHAIN_FILE=../ydb/clang.toolchain \ --DCMAKE_C_FLAGS_RELEASE="-O2 -UNDEBUG" \ --DCMAKE_CXX_FLAGS_RELEASE="-O2 -UNDEBUG" \ ../ydb echo "::endgroup::" |