Skip to content

Commit 3651728

Browse files
authored
Merge branch 'main' into YDBOPS-8928
2 parents 82b6677 + eee3fb5 commit 3651728

File tree

16,776 files changed

+71775
-4941675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

16,776 files changed

+71775
-4941675
lines changed

.github/scripts/tests/generate-summary.py

+19-4
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ def add_line(self, line: TestSummaryLine):
144144
self.is_failed |= line.is_failed
145145
self.lines.append(line)
146146

147+
@property
148+
def is_empty(self):
149+
return len(self.lines) == 0
150+
147151
def render_line(self, items):
148152
return f"| {' | '.join(items)} |"
149153

@@ -249,8 +253,12 @@ def write_summary(summary: TestSummary):
249253
else:
250254
fp = sys.stdout
251255

252-
for line in summary.render(add_footnote=True):
253-
fp.write(f"{line}\n")
256+
if summary.is_empty:
257+
fp.write(":red_circle: Test run completed, no test results found. Please check build logs.")
258+
else:
259+
for line in summary.render(add_footnote=True):
260+
fp.write(f"{line}\n")
261+
254262
fp.write("\n")
255263

256264
if summary_fn:
@@ -267,6 +275,9 @@ def gen_summary(summary_url_prefix, summary_out_folder, paths):
267275
test_result = TestResult.from_junit(case)
268276
summary_line.add(test_result)
269277

278+
if not summary_line.tests:
279+
continue
280+
270281
report_url = f"{summary_url_prefix}{html_fn}"
271282

272283
render_testlist_html(summary_line.tests, os.path.join(summary_out_folder, html_fn))
@@ -277,8 +288,12 @@ def gen_summary(summary_url_prefix, summary_out_folder, paths):
277288

278289

279290
def get_comment_text(pr: PullRequest, summary: TestSummary, build_preset: str, test_history_url: str):
280-
281-
if summary.is_failed:
291+
if summary.is_empty:
292+
return [
293+
f":red_circle: **{build_preset}**: Test run completed, no test results found for commit {pr.head.sha}. "
294+
f"Please check build logs."
295+
]
296+
elif summary.is_failed:
282297
result = f":red_circle: **{build_preset}**: some tests FAILED"
283298
else:
284299
result = f":green_circle: **{build_preset}**: all tests PASSED"

.github/workflows/build_and_test_provisioned.yml

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
steps:
5656
- name: Checkout
5757
uses: actions/checkout@v3
58+
with:
59+
ref: cmakebuild
5860
- name: Build
5961
uses: ./.github/actions/build
6062
if: inputs.run_build

.gitignore

+32
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,35 @@ __pycache__/
4040

4141
# KDevelop IDE
4242
*.kdev4
43+
44+
# Other symlinks
45+
contrib/python/protobuf/py3/google.protobuf.internal._api_implementation.reg3.cpp
46+
contrib/python/protobuf/py3/google.protobuf.pyext._message.reg3.cpp
47+
contrib/tools/python3/src/Modules/_sqlite/_sqlite3.reg3.cpp
48+
contrib/tools/ragel6/all_cd.cpp
49+
contrib/tools/ragel6/all_cs.cpp
50+
contrib/tools/ragel6/all_fs.cpp
51+
contrib/tools/ragel6/all_go.cpp
52+
contrib/tools/ragel6/all_ml.cpp
53+
contrib/tools/ragel6/all_other.cpp
54+
contrib/tools/ragel6/all_r.cpp
55+
library/python/runtime_py3/__res.pyx.cpp
56+
library/python/runtime_py3/__res.reg3.cpp
57+
library/python/runtime_py3/sitecustomize.pyx.cpp
58+
library/python/runtime_py3/sitecustomize.reg3.cpp
59+
library/python/symbols/module/library.python.symbols.module.syms.reg3.cpp
60+
util/all_datetime.cpp
61+
util/all_digest.cpp
62+
util/all_folder.cpp
63+
util/all_generic.cpp
64+
util/all_memory.cpp
65+
util/all_network.cpp
66+
util/all_random.cpp
67+
util/all_stream.cpp
68+
util/all_string.cpp
69+
util/all_system_1.cpp
70+
util/all_system_2.cpp
71+
util/all_thread.cpp
72+
util/all_util.cpp
73+
util/charset/all_charset.cpp
74+

build/conf/bison_lex.conf

+12-5
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,20 @@ _CPP_BISON_SKELS=\
2626
_BISON_GEN_EXT=.cpp
2727
_FLEX_GEN_EXT=.cpp
2828

29-
_BISON_HEADER=--defines=${nopath;noext;output;main;addincl;norel;suf=.h:SRC}
30-
_BISON_PP=$YMAKE_PYTHON ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${nopath;noext;tmp:SRC.h}
31-
32-
_FLEX_TOOL=${tool:"contrib/tools/flex-old"}
33-
_FLEX_TOOL_DIR=contrib/tools/flex-old
29+
_BISON_HEADER=
30+
_BISON_PP=
31+
_FLEX_TOOL=
32+
_FLEX_TOOL_DIR=
3433
_FLEX_HEADER=
3534

35+
when ($_BISON_FLEX_SET_DEFAULTS == "yes") {
36+
_BISON_HEADER=--defines=${nopath;noext;output;main;addincl;norel;suf=.h:SRC}
37+
_BISON_PP=$YMAKE_PYTHON ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${nopath;noext;tmp:SRC.h}
38+
_FLEX_TOOL=${tool:"contrib/tools/flex-old"}
39+
_FLEX_TOOL_DIR=contrib/tools/flex-old
40+
_FLEX_HEADER=
41+
}
42+
3643
### @usage: FLEX_FLAGS(<flags>)
3744
###
3845
### Set flags for Lex tool (flex) invocations.

build/scripts/clang_tidy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def ensure_clean_dir(path):
158158
"-p",
159159
compile_command_path,
160160
"--warnings-as-errors",
161-
"*",
161+
"*,-clang-diagnostic-#pragma-messages",
162162
"--config-file",
163163
result_config_file,
164164
"--header-filter",

build/ymake.core.conf

+1
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ module _BASE_UNIT: _BARE_UNIT {
783783
}
784784

785785
ENABLE(USE_YASM_ASSEMBLER)
786+
ENABLE(_BISON_FLEX_SET_DEFAULTS)
786787
}
787788

788789
_LINKER_ID=

build/ymake_conf.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ def __init__(self, name, os, arch):
7575
self.is_riscv32 = self.is_rv32imc
7676

7777
self.is_nds32 = self.arch in ('nds32le_elf_mculib_v5f',)
78+
self.is_tc32 = self.arch in ('tc32_elf',)
7879

7980
self.is_xtensa = self.arch in ('xtensa_hifi5',)
8081

@@ -100,7 +101,7 @@ def __init__(self, name, os, arch):
100101
self.is_wasm64 = self.arch == 'wasm64'
101102
self.is_wasm = self.is_wasm64
102103

103-
self.is_32_bit = self.is_x86 or self.is_armv7 or self.is_armv8m or self.is_riscv32 or self.is_nds32 or self.is_armv7em or self.is_xtensa
104+
self.is_32_bit = self.is_x86 or self.is_armv7 or self.is_armv8m or self.is_riscv32 or self.is_nds32 or self.is_armv7em or self.is_xtensa or self.is_tc32
104105
self.is_64_bit = self.is_x86_64 or self.is_armv8 or self.is_powerpc or self.is_wasm64
105106

106107
assert self.is_32_bit or self.is_64_bit
@@ -183,6 +184,7 @@ def arch_variables(self):
183184
(self.is_riscv32, 'ARCH_RISCV32'),
184185
(self.is_xtensa, 'ARCH_XTENSA'),
185186
(self.is_nds32, 'ARCH_NDS32'),
187+
(self.is_tc32, 'ARCH_TC32'),
186188
(self.is_wasm64, 'ARCH_WASM64'),
187189
(self.is_32_bit, 'ARCH_TYPE_32'),
188190
(self.is_64_bit, 'ARCH_TYPE_64'),
@@ -1047,7 +1049,7 @@ def __init__(self, build, detector):
10471049

10481050
self.os_sdk_local = False
10491051

1050-
if build.target.is_apple and to_bool(preset('APPLE_SDK_LOCAL'), default=False):
1052+
if build.host.is_apple and build.target.is_apple and to_bool(preset('APPLE_SDK_LOCAL'), default=False):
10511053
self.os_sdk_local = True
10521054

10531055
if self.os_sdk == 'local':
@@ -1406,8 +1408,8 @@ def __init__(self, tc, build):
14061408
'-fdebug-default-version=4',
14071409
]
14081410
elif self.tc.is_gcc:
1409-
if self.target.is_xtensa:
1410-
# Xtensa toolchain does not support this flag
1411+
if self.target.is_xtensa or self.target.is_tc32:
1412+
# Xtensa and tc32 toolchains does not support this flag
14111413
pass
14121414
else:
14131415
self.c_foptions += [

contrib/clickhouse/base/base/BorrowedObjectPool.h

-158
This file was deleted.

contrib/clickhouse/base/base/DayNum.h

-14
This file was deleted.

0 commit comments

Comments
 (0)