Skip to content

Commit f499f08

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #8771 from ydb-platform/mergelibs-240905-0836
Library import 240905-0836
2 parents 67bd625 + 79d4a6c commit f499f08

File tree

488 files changed

+4060
-3651
lines changed

Some content is hidden

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

488 files changed

+4060
-3651
lines changed

‎build/conf/settings.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
1515
REPORT_ALL_DUPSRC=yes
1616
DEPS_CACHE_CONTROL_UIDS_CACHE=yes
1717
INCLUDE_BLACKLIST_TO_CONF_HASH=no
18-
INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
18+
INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=no
1919
USE_GRAND_BYPASS=no
2020
USE_GLOBAL_CMD=yes
2121
YMAKE_USE_NEW_UIDS=yes
@@ -129,4 +129,3 @@ _FOLDABLE_VARS=\
129129

130130
ARCADIA_TEST_ROOT=../arcadia_tests_data/
131131
DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
132-

‎build/export_generators/ide-gradle/build.gradle.kts.jinja‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ plugins {
4444
{%- endif %}
4545
}
4646
{# language level #}
47+
{%- if target.required_jdk != "" %}
4748
java {
4849
toolchain {
4950
languageVersion = JavaLanguageVersion.of("{{ target.required_jdk }}")
5051
}
5152
}
53+
{% endif -%}
5254
{%- if target.with_kotlinc_plugin_allopen %}
5355

5456
allOpen {

‎build/mapping.conf.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,8 @@
381381
"6892348074": "https://devtools-registry.s3.yandex.net/6892348074",
382382
"6924868447": "https://devtools-registry.s3.yandex.net/6924868447",
383383
"6924868767": "https://devtools-registry.s3.yandex.net/6924868767",
384+
"7000556602": "https://devtools-registry.s3.yandex.net/7000556602",
385+
"7000559763": "https://devtools-registry.s3.yandex.net/7000559763",
384386
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
385387
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
386388
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1216,6 +1218,8 @@
12161218
"6892348074": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
12171219
"6924868447": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
12181220
"6924868767": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1221+
"7000556602": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1222+
"7000559763": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
12191223
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
12201224
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
12211225
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

‎build/platform/test_tool/host.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866298)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000557899)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924865372)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000557002)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924868767)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000559763)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924864489)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556408)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924867240)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000558863)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866817)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000555716)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924866115)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000555346)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924868447)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556602)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924865342)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000554860)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6924867637)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7000556186)
1111

1212
ENDIF()

‎build/plugins/lib/test_const/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@
209209
WINE_TOOL = 'WINE_TOOL_RESOURCE_GLOBAL'
210210
WINE32_TOOL = 'WINE32_TOOL_RESOURCE_GLOBAL'
211211

212+
DEFAULT_CRASHED_STATUS_COMMENT = "Test crashed"
213+
212214

213215
class Enum(object):
214216
@classmethod

‎build/sysincl/libc-to-nothing.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,12 @@
108108
- sys/mtio.h
109109
- sys/param.h
110110
- sys/personality.h
111+
- sys/platform/ppc.h
111112
- sys/poll.h
112113
- sys/prctl.h
113114
- sys/procfs.h
114115
- sys/ptrace.h
116+
- sys/queue.h
115117
- sys/quota.h
116118
- sys/reboot.h
117119
- sys/resource.h
@@ -122,12 +124,14 @@
122124
- sys/signalfd.h
123125
- sys/signal.h
124126
- sys/socket.h
127+
- sys/socketvar.h
125128
- sys/soundcard.h
126129
- sys/statfs.h
127130
- sys/stat.h
128131
- sys/statvfs.h
129132
- sys/stropts.h
130133
- sys/syscall.h
134+
- sys/sysctl.h
131135
- sys/sysinfo.h
132136
- sys/syslog.h
133137
- sys/sysmacros.h
@@ -142,16 +146,19 @@
142146
- sys/ucontext.h
143147
- sys/uio.h
144148
- sys/un.h
149+
- sys/unistd.h
145150
- sys/user.h
146151
- sys/utsname.h
147152
- sys/vfs.h
148153
- sys/vt.h
149154
- sys/wait.h
150155
- sys/xattr.h
151156
- tar.h
157+
- termio.h
152158
- termios.h
153159
- threads.h
154160
- time.h
161+
- ttyent.h
155162
- uchar.h
156163
- ucontext.h
157164
- ulimit.h
@@ -162,3 +169,4 @@
162169
- values.h
163170
- wait.h
164171
- wordexp.h
172+
- xlocale.h

‎build/sysincl/linux.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,3 @@
4040
- sgtty.h
4141
- sys/bitypes.h
4242
- sys/cdefs.h
43-
- sys/memfd.h
44-
- sys/queue.h
45-
- sys/platform/ppc.h
46-
- sys/socketvar.h
47-
- sys/sysctl.h
48-
- sys/unistd.h
49-
- termio.h
50-
- ttyent.h
51-
- ustat.h
52-
- xlocale.h

‎build/ymake.core.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5651,7 +5651,7 @@ TEST_TOOL_HOST_LOCAL=
56515651
TEST_TOOL_TARGET_LOCAL=
56525652

56535653
when ($MOST_USED_CUDA) {
5654-
CUDA11=yes
5654+
CUDA12=yes
56555655
}
56565656

56575657
CUDA_VERSION=0

‎build/ymake_conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2451,7 +2451,7 @@ def have_cuda_in_arcadia(self):
24512451

24522452
if self.cuda_version.value in ('11.4', '11.8', '12.1', '12.2'):
24532453
return True
2454-
elif self.cuda_version.value in ('10.2',) and target.is_linux_armv8:
2454+
elif self.cuda_version.value in ('10.2', '11.4.19') and target.is_linux_armv8:
24552455
return True
24562456
else:
24572457
raise ConfigureError('CUDA version {} is not supported in Arcadia'.format(self.cuda_version.value))
@@ -2465,7 +2465,7 @@ def auto_have_cuda(self):
24652465

24662466
def auto_cuda_version(self):
24672467
if self.use_arcadia_cuda.value:
2468-
return '11.4'
2468+
return '12.2'
24692469

24702470
if not self.have_cuda.value:
24712471
return None

0 commit comments

Comments
 (0)