Skip to content

Commit a54252c

Browse files
committed
Merge pull request #20271 from ydb-platform/merge-libs-250627-0050
2 parents 7680649 + 78749cc commit a54252c

File tree

1,061 files changed

+27563
-30615
lines changed

Some content is hidden

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

1,061 files changed

+27563
-30615
lines changed

.github/config/muted_ya.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ ydb/core/blobstorage/pdisk/ut TPDiskTest.PDiskSlotSizeInUnits
1919
ydb/core/blobstorage/ut_blobstorage GroupReconfiguration.BsControllerDoesNotDisableGroupNoRequestsToNodesWVDisks
2020
ydb/core/blobstorage/ut_blobstorage NodeDisconnected.BsQueueRetries
2121
ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration GroupReconfigurationRace.Test_block42
22-
ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration [*/*] chunk chunk
22+
ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration *.[*/*] chunk
2323
ydb/core/blobstorage/ut_blobstorage/ut_huge HugeBlobOnlineSizeChange.Compaction
24-
ydb/core/blobstorage/ut_blobstorage/ut_huge [*/*] chunk chunk
24+
ydb/core/blobstorage/ut_blobstorage/ut_huge unittest.[*/*] chunk
2525
ydb/core/blobstorage/ut_blobstorage/ut_scrub BlobScrubbing.block42
2626
ydb/core/blobstorage/ut_blobstorage/ut_scrub BlobScrubbing.mirror3dc
2727
ydb/core/blobstorage/ut_blobstorage/ut_scrub BlobScrubbing.mirror3of4
2828
ydb/core/blobstorage/ut_blobstorage/ut_statestorage TStateStorageRingGroupState.TestProxyConfigMismatch
2929
ydb/core/blobstorage/ut_vdisk TBsVDiskGC.GCPutKeepBarrierSync
3030
ydb/core/blobstorage/ut_vdisk TBsVDiskManyPutGet.ManyPutRangeGetCompactionIndexOnly
31-
ydb/core/blobstorage/ut_vdisk [*/*] chunk chunk
31+
ydb/core/blobstorage/ut_vdisk unittest.[*/*] chunk
3232
ydb/core/cms/ut_sentinel_unstable TSentinelUnstableTests.BSControllerCantChangeStatus
33-
ydb/core/external_sources/s3/ut sole chunk chunk
34-
ydb/core/fq/libs/row_dispatcher/ut sole chunk chunk
33+
ydb/core/external_sources/s3/ut *.sole chunk
34+
ydb/core/fq/libs/row_dispatcher/ut *.sole chunk
3535
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadHuge
3636
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.ReadSmall
3737
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteHuge
3838
ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
39-
ydb/core/kqp/ut/batch_operations [*/*] chunk chunk
39+
ydb/core/kqp/ut/batch_operations *.[*/*] chunk
4040
ydb/core/kqp/ut/cost KqpCost.VectorIndexLookup+useSink
4141
ydb/core/kqp/ut/cost KqpCost.VectorIndexLookup-useSink
4242
ydb/core/kqp/ut/data_integrity KqpDataIntegrityTrails.UpsertEvWriteQueryService-isOlap+useOltpSink
4343
ydb/core/kqp/ut/federated_query/large_results KqpScriptExecResults.ExecuteScriptWithLargeFile
44-
ydb/core/kqp/ut/federated_query/s3 sole chunk chunk
44+
ydb/core/kqp/ut/federated_query/s3 unittest.sole chunk
4545
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingAsyncIndex
4646
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingSyncIndex
47-
ydb/core/kqp/ut/olap [*/*] chunk chunk
47+
ydb/core/kqp/ut/olap *.[*/*] chunk
4848
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestAggregation
4949
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterCompare
5050
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterEqual
@@ -64,8 +64,8 @@ ydb/core/kqp/ut/query KqpLimits.StreamWrite+Allowed
6464
ydb/core/kqp/ut/query KqpStats.DeferredEffects+UseSink
6565
ydb/core/kqp/ut/query KqpStats.SysViewClientLost
6666
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
67-
ydb/core/kqp/ut/scheme [*/*] chunk chunk
68-
ydb/core/kqp/ut/service [*/*] chunk chunk
67+
ydb/core/kqp/ut/scheme *.[*/*] chunk
68+
ydb/core/kqp/ut/service *.[*/*] chunk
6969
ydb/core/kqp/ut/yql KqpScripting.StreamExecuteYqlScriptScanOperationTmeoutBruteForce
7070
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
7171
ydb/core/statistics/aggregator/ut AnalyzeColumnshard.AnalyzeRebootColumnShard
@@ -89,14 +89,14 @@ ydb/core/viewer/ut Viewer.TabletMerging
8989
ydb/library/actors/interconnect/ut_fat InterconnectZcLocalOp.ZcDisabledAfterHiddenCopy
9090
ydb/library/actors/interconnect/ut_fat InterconnectZcLocalOp.ZcIsDisabledByDefault
9191
ydb/library/actors/interconnect/ut_huge_cluster HugeCluster.AllToAll
92-
ydb/library/actors/interconnect/ut_huge_cluster sole chunk chunk
92+
ydb/library/actors/interconnect/ut_huge_cluster *.sole chunk
9393
ydb/library/yql/dq/opt/ut InterestingOrderingsShuffle.Join64ChainImitation
94-
ydb/library/yql/dq/opt/ut sole chunk chunk
95-
ydb/library/yql/tests/sql/dq_file/part11 [*/*] chunk chunk
94+
ydb/library/yql/dq/opt/ut *.sole chunk
95+
ydb/library/yql/tests/sql/dq_file/part11 *.sole chunk
9696
ydb/library/yql/tests/sql/dq_file/part11 test.py.test[pg-tpch-q02-default.txt-ForceBlocks]
97-
ydb/mvp/oidc_proxy/ut sole chunk chunk
97+
ydb/mvp/oidc_proxy/ut *.sole chunk
9898
ydb/public/sdk/cpp/src/client/federated_topic/ut BasicUsage.PropagateSessionClosed
99-
ydb/public/sdk/cpp/src/client/federated_topic/ut [*/*] chunk chunk
99+
ydb/public/sdk/cpp/src/client/federated_topic/ut *.[*/*] chunk
100100
ydb/public/sdk/cpp/src/client/topic/ut TxUsage.Sinks_Oltp_WriteToTopicAndTable_6_Query
101101
ydb/public/sdk/cpp/src/client/topic/ut TxUsage.Sinks_Oltp_WriteToTopicAndTable_6_Table
102102
ydb/public/sdk/cpp/src/client/topic/ut TxUsage.Sinks_Oltp_WriteToTopic_3_Query
@@ -109,29 +109,29 @@ ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut TxUsage.Sinks_Oltp_Wr
109109
ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut TxUsage.Sinks_Oltp_WriteToTopic_3_Query
110110
ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut TxUsage.WriteToTopic_Demo_25_Query
111111
ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut TxUsage.WriteToTopic_Demo_26_Query
112-
ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut [*/*] chunk chunk
112+
ydb/public/sdk/cpp/src/client/topic/ut/with_direct_read_ut *.[*/*] chunk
113113
ydb/public/sdk/cpp/tests/integration/sessions_pool YdbSdkSessionsPool.StressTestSync/0
114114
ydb/public/sdk/cpp/tests/integration/sessions_pool YdbSdkSessionsPool.StressTestSync/1
115115
ydb/public/sdk/cpp/tests/integration/topic TxUsageQuery.WriteToTopic_Demo_26
116116
ydb/public/sdk/cpp/tests/integration/topic/with_direct_read DirectReadWithClient.ManyMessages
117117
ydb/public/sdk/cpp/tests/integration/topic/with_direct_read TxUsageQuery.WriteToTopic_Demo_26
118-
ydb/public/sdk/cpp/tests/integration/topic/with_direct_read [*/*] chunk chunk
118+
ydb/public/sdk/cpp/tests/integration/topic/with_direct_read *.[*/*] chunk
119119
ydb/services/persqueue_v1/ut TPersQueueTest.CacheHead
120120
ydb/services/persqueue_v1/ut TPersQueueTest.LOGBROKER_7820
121121
ydb/services/persqueue_v1/ut TPersQueueTest.TopicServiceCommitOffsetBadOffsets
122-
ydb/services/persqueue_v1/ut [*/*] chunk chunk
122+
ydb/services/persqueue_v1/ut *.[*/*] chunk
123123
ydb/services/persqueue_v1/ut/new_schemecache_ut TPersQueueNewSchemeCacheTest.TestReadAtTimestamp_3
124124
ydb/services/ydb/backup_ut BackupRestore.RestoreReplicationThatDoesNotUseSecret
125125
ydb/services/ydb/backup_ut CommonEncryptionRequirementsTest.CommonEncryptionRequirements
126-
ydb/services/ydb/sdk_sessions_ut [*/*] chunk chunk
127-
ydb/services/ydb/table_split_ut [*/*] chunk chunk
126+
ydb/services/ydb/sdk_sessions_ut *.[*/*] chunk
127+
ydb/services/ydb/table_split_ut *.[*/*] chunk
128128
ydb/services/ydb/ut TGRpcAuthentication.NoDescribeRights
129129
ydb/services/ydb/ut YdbLogStore.AlterLogTable
130130
ydb/tests/compatibility [test_compatibility.py */*] chunk chunk
131131
ydb/tests/compatibility [test_example.py */*] chunk chunk
132132
ydb/tests/compatibility [test_statistics.py */*] chunk chunk
133133
ydb/tests/compatibility [test_transfer.py */*] chunk chunk
134-
ydb/tests/compatibility sole chunk chunk
134+
ydb/tests/compatibility *.sole chunk
135135
ydb/tests/compatibility test_batch_operations.py.TestBatchOperations.test_batch_delete[rolling_24-4_to_25-1]
136136
ydb/tests/compatibility test_batch_operations.py.TestBatchOperations.test_batch_delete[rolling_stable-24-4_to_stable-25-1-2]
137137
ydb/tests/compatibility test_batch_operations.py.TestBatchOperations.test_batch_update[rolling_24-4_to_25-1]
@@ -229,11 +229,11 @@ ydb/tests/compatibility test_transfer.py.TestTransferRollingUpdate.test_transfer
229229
ydb/tests/compatibility udf.test_datetime2.py.TestDatetime2.test_all[mixed_current_and_25-1]
230230
ydb/tests/datashard/vector_index/large test_vector_index.py.TestVectorIndex.test_vector_index
231231
ydb/tests/datashard/vector_index/large test_vector_index_large_levels_and_clusters.py.TestVectorIndexLargeLevelsAndClusters.test_vecot_index_large_levels_and_clusters
232-
ydb/tests/fq/control_plane_storage [*/*] chunk chunk
232+
ydb/tests/fq/control_plane_storage *.[*/*] chunk
233233
ydb/tests/fq/mem_alloc test_scheduling.py.TestSchedule.test_skip_busy[kikimr0]
234234
ydb/tests/fq/multi_plane [test_retry.py] chunk chunk
235235
ydb/tests/fq/multi_plane [test_retry_high_rate.py] chunk chunk
236-
ydb/tests/fq/yds [*/*] chunk chunk
236+
ydb/tests/fq/yds *.[*/*] chunk
237237
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_same[v1]
238238
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_sequence[v1]
239239
ydb/tests/fq/yds test_mem_alloc.py.TestMemAlloc.test_hop_alloc[v1]
@@ -273,7 +273,7 @@ ydb/tests/functional/config test_distconf_reassign_state_storage.py.TestKiKiMRDi
273273
ydb/tests/functional/encryption test_encryption.py.TestEncryption.test_simple_encryption
274274
ydb/tests/functional/hive test_drain.py.TestHive.test_drain_on_stop
275275
ydb/tests/functional/rename [test_rename.py */*] chunk chunk
276-
ydb/tests/functional/serializable sole chunk chunk
276+
ydb/tests/functional/serializable *.sole chunk
277277
ydb/tests/functional/serverless test_serverless.py.test_database_with_disk_quotas[enable_alter_database_create_hive_first--false]
278278
ydb/tests/functional/serverless test_serverless.py.test_database_with_disk_quotas[enable_alter_database_create_hive_first--true]
279279
ydb/tests/functional/suite_tests [test_postgres.py */*] chunk chunk
@@ -287,15 +287,15 @@ ydb/tests/functional/tenants test_tenants.py.TestTenants.test_list_database_abov
287287
ydb/tests/functional/tenants test_tenants.py.TestTenants.test_stop_start[enable_alter_database_create_hive_first--false]
288288
ydb/tests/functional/tenants test_tenants.py.TestTenants.test_stop_start[enable_alter_database_create_hive_first--true]
289289
ydb/tests/functional/tpc/large [test_tpcds.py] chunk chunk
290-
ydb/tests/functional/tpc/large sole chunk chunk
290+
ydb/tests/functional/tpc/large *.sole chunk
291291
ydb/tests/functional/tpc/large test_tpcds.py.TestTpcdsS1.test_tpcds[59]
292292
ydb/tests/functional/tpc/medium test_workload_oltp.py.TestWorkloadSimpleQueue.test_workload_oltp
293293
ydb/tests/functional/tpc/medium test_workload_simple_queue.py.TestWorkloadSimpleQueue.test_workload_simple_queue[row]
294294
ydb/tests/functional/ydb_cli test_ydb_backup.py.TestDatabaseBackup.test_database_backup
295295
ydb/tests/functional/ydb_cli test_ydb_backup.py.TestDatabaseBackupRestore.test_database_backup_restore
296-
ydb/tests/olap [*/*] chunk chunk
297-
ydb/tests/olap sole chunk chunk
298-
ydb/tests/olap/scenario sole chunk chunk
296+
ydb/tests/olap *.[*/*] chunk
297+
ydb/tests/olap *.sole chunk
298+
ydb/tests/olap/scenario *.sole chunk
299299
ydb/tests/olap/scenario test_alter_tiering.py.TestAlterTiering.test[many_tables]
300300
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[Test64BitErrorChecking]
301301
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestArrayScanBackend]
@@ -374,10 +374,10 @@ ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generate
374374
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestTimestampWithTimeZone]
375375
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestTxOptions]
376376
ydb/tests/postgres_integrations/go-libpq docker_wrapper_test.py.test_pg_generated[TestXactMultiStmt]
377-
ydb/tests/sql/large sole chunk chunk
377+
ydb/tests/sql/large *.sole chunk
378378
ydb/tests/stress/log/tests test_workload.py.TestYdbLogWorkload.test[column]
379379
ydb/tests/stress/mixedpy test_mixed.py.TestYdbMixedWorkload.test[column]
380-
ydb/tests/stress/reconfig_state_storage_workload/tests sole chunk chunk
380+
ydb/tests/stress/reconfig_state_storage_workload/tests *.sole chunk
381381
ydb/tests/stress/reconfig_state_storage_workload/tests test_board_workload.py.TestReconfigStateStorageBoardWorkload.test_state_storage_board
382382
ydb/tests/stress/reconfig_state_storage_workload/tests test_scheme_board_workload.py.TestReconfigSchemeBoardWorkload.test_scheme_board
383383
ydb/tests/stress/reconfig_state_storage_workload/tests test_state_storage_workload.py.TestReconfigStateStorageWorkload.test_state_storage

.github/scripts/tests/transform_ya_junit.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ def transform(fp, mute_check: YaMuteCheck, ya_out_dir, save_inplace, log_url_pre
186186

187187
for case in suite.findall("testcase"):
188188
test_name = case.get("name")
189+
test_classname = case.get("classname") + '.' + test_name
190+
case.set("name", test_classname)
189191
case.set("classname", suite_name)
192+
test_name = test_classname
190193

191194
is_fail = is_faulty_testcase(case)
192195
has_fail_tests |= is_fail
@@ -269,6 +272,5 @@ def main():
269272
test_stuff_prefix,
270273
)
271274

272-
273275
if __name__ == "__main__":
274276
main()

build/export_generators/cmake/dir_targets.jinja

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
{%- set args = list_of_dict|selectattr(macro_field, 'eq', macro)|map(attribute=args_field)|sum -%}
55
{%- if args|length %}
66
{{ macro }}({{ target_name }}{{ macro_suffix }}
7-
{%- for arg in args %}
7+
{%- for arg in args -%}
8+
{%- if ('"' in arg) and (arg[0] != '"') %}
9+
[=[{{ arg }}]=]
10+
{%- else %}
811
{{ arg }}
12+
{%- endif -%}
913
{%- endfor %}
1014
)
1115
{% endif %}

build/external_resources/go_tools/ya.make

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ TOOLCHAIN(go)
55
IF(GOSTD_VERSION == 1.23)
66
VERSION(1.23)
77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.23.json)
8+
ELSEIF(GOSTD_VERSION == 1.24)
9+
VERSION(1.24)
10+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.24.json)
11+
ELSEIF(GOSTD_VERSION == 1.25)
12+
VERSION(1.25)
13+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.25.json)
814
ELSE()
915
MESSAGE(FATAL_ERROR Unsupported version [${GOSTD_VERSION}] of Go Standard Library)
1016
ENDIF()

build/mapping.conf.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@
571571
"8944928850": "{registry_endpoint}/8944928850",
572572
"8980584272": "{registry_endpoint}/8980584272",
573573
"9029509511": "{registry_endpoint}/9029509511",
574+
"9059000402": "{registry_endpoint}/9059000402",
574575
"5486731632": "{registry_endpoint}/5486731632",
575576
"5514350352": "{registry_endpoint}/5514350352",
576577
"5514360398": "{registry_endpoint}/5514360398",
@@ -2072,6 +2073,7 @@
20722073
"8944928850": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20732074
"8980584272": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20742075
"9029509511": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2076+
"9059000402": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20752077
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20762078
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20772079
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
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:9029515707)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059043122)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029513855)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059040296)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029519042)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059050710)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029512688)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059037599)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029517384)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059047042)
1111

1212
ENDIF()
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:9029506769)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058995494)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029504959)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058993203)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029509511)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059000402)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029503739)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058991328)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029508202)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058997687)
1111

1212
ENDIF()

contrib/libs/icu/.yandex_meta/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@
66
from devtools.yamaker.project import NixProject
77

88

9+
def _get_major_version(version: str) -> str:
10+
return version.split('.')[0]
11+
12+
913
def post_build(self):
1014
# copying icudt.dat file from original repository
11-
icu_dat_path = f"{self.srcdir}/data/in/icudt76l.dat"
12-
rodata_path = f"{self.dstdir}/icudt76_dat.rodata"
15+
major_version = _get_major_version(self.version)
16+
icu_dat_path = f"{self.srcdir}/data/in/icudt{major_version}l.dat"
17+
rodata_path = f"{self.dstdir}/icudt{major_version}_dat.rodata"
1318
shutil.copy(icu_dat_path, rodata_path)
1419

1520

1621
def post_install(self):
1722
result_target = self.yamakes["."]
1823

19-
result_target.SRCS.add("icudt76_dat.rodata")
24+
major_version = _get_major_version(self.version)
25+
result_target.SRCS.add(f"icudt{major_version}_dat.rodata")
2026

2127
result_target.CFLAGS = [
2228
"-DU_COMMON_IMPLEMENTATION",
@@ -84,7 +90,7 @@ def post_install(self):
8490
"g:cpp-contrib",
8591
],
8692
arcdir="contrib/libs/icu",
87-
nixattr="icu74",
93+
nixattr="icu",
8894
put_with={
8995
"icuio": [
9096
"icuuc",

contrib/libs/icu/.yandex_meta/devtools.copyrights.report

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,17 @@ BELONGS ya.make
336336
Files with this license:
337337
readme.html [7:10]
338338

339+
KEEP COPYRIGHT_SERVICE_LABEL 15a10786a52ce6e33763c52348c47981
340+
BELONGS ya.make
341+
License text:
342+
Copyright © 2016-2025 Unicode, Inc.
343+
Scancode info:
344+
Original SPDX id: COPYRIGHT_SERVICE_LABEL
345+
Score : 100.00
346+
Match type : COPYRIGHT
347+
Files with this license:
348+
LICENSE [5:5]
349+
339350
KEEP COPYRIGHT_SERVICE_LABEL 15d83207399227b14a1044b1cba00a64
340351
BELONGS ya.make
341352
License text:
@@ -761,17 +772,6 @@ BELONGS ya.make
761772
include/unicode/selfmt.h [4:6]
762773
include/unicode/umsg.h [4:6]
763774

764-
KEEP COPYRIGHT_SERVICE_LABEL 2a4e27e8d5d46fb305aaa9ee946c9903
765-
BELONGS ya.make
766-
License text:
767-
Copyright © 2016-2024 Unicode, Inc.
768-
Scancode info:
769-
Original SPDX id: COPYRIGHT_SERVICE_LABEL
770-
Score : 100.00
771-
Match type : COPYRIGHT
772-
Files with this license:
773-
LICENSE [5:5]
774-
775775
KEEP COPYRIGHT_SERVICE_LABEL 2b694c7444010b1b84ed2710400fe3ef
776776
BELONGS ya.make
777777
Note: matched license text is too long. Read it in the source files.
@@ -3450,7 +3450,7 @@ BELONGS ya.make
34503450
Score : 100.00
34513451
Match type : COPYRIGHT
34523452
Files with this license:
3453-
i18n/messageformat2.cpp [523:525]
3453+
i18n/messageformat2.cpp [505:507]
34543454

34553455
KEEP COPYRIGHT_SERVICE_LABEL a021d3bd6d6cbb97cbccc0ab1586c491
34563456
BELONGS ya.make
@@ -3840,7 +3840,7 @@ BELONGS ya.make
38403840
Score : 100.00
38413841
Match type : COPYRIGHT
38423842
Files with this license:
3843-
APIChangeReport.html [1173:1175]
3843+
APIChangeReport.html [566:568]
38443844

38453845
KEEP COPYRIGHT_SERVICE_LABEL c1b7297fc443f46a1d1de36f8b788822
38463846
BELONGS ya.make
@@ -4354,7 +4354,7 @@ BELONGS ya.make
43544354
Score : 100.00
43554355
Match type : COPYRIGHT
43564356
Files with this license:
4357-
i18n/messageformat2.cpp [581:591]
4357+
i18n/messageformat2.cpp [563:573]
43584358

43594359
KEEP COPYRIGHT_SERVICE_LABEL eed7e8b3d80757822970ac3a50dd6716
43604360
BELONGS ya.make

0 commit comments

Comments
 (0)