diff options
| author | AlexSm <alex@ydb.tech> | 2024-10-24 12:31:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 12:31:03 +0200 |
| commit | 1a715cd2408e4feb9571edc43b4189412f7f48b4 (patch) | |
| tree | 10bd0cf251d44f9fc733c38416bd5c9ad12d8a47 | |
| parent | e2339333d2b26405e9584d584f193f1009d0d7e0 (diff) | |
| download | ydb-1a715cd2408e4feb9571edc43b4189412f7f48b4.tar.gz | |
Append TOKEN antlr patch to non-sanitizer build (#10829)
| -rw-r--r-- | .github/actions/build/action.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index f06276597b..fbab533054 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -30,8 +30,6 @@ runs: cd ../build rm -rf * - export CC=/usr/bin/clang-14 - export CC_FOR_BUILD=$CC cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCCACHE_PATH=/usr/local/bin/ccache \ -DCMAKE_TOOLCHAIN_FILE=../ydb/clang.toolchain \ @@ -42,12 +40,13 @@ runs: shell: bash if: ${{!inputs.sanitizer}} run: | + # Temporary patch to dix difference between antlr4.9 and 4.13 behaviour + sed -i 's/TOKEN(NULL)/TOKEN(NULL_)/g' ydb/public/lib/ydb_cli/commands/interactive/yql_highlight.cpp + mkdir -p ../build cd ../build rm -rf * export CONAN_USER_HOME=`pwd` - export CC=/usr/bin/clang-14 - export CC_FOR_BUILD=$CC # FIXME: set DCMAKE_CXX_FLAGS_RELWITHDEBINFO and DCMAKE_CXX_FLAGS bacause of global_flags.cmake flags override. |