Skip to content

Commit 64443e6

Browse files
committed
Merge branch 'rightlib' into mergelibs-241003-1145
2 parents 75c9a74 + 58e2416 commit 64443e6

Some content is hidden

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

82 files changed

+1211
-1408
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6913307396"
4+
"uri": "sbr:7196092605"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6913305359"
7+
"uri": "sbr:7196092155"
88
},
99
"linux": {
10-
"uri": "sbr:6913303010"
10+
"uri": "sbr:7196091589"
1111
}
1212
}
1313
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6913264356"
4+
"uri": "sbr:7196077522"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6913262072"
7+
"uri": "sbr:7196076872"
88
},
99
"linux": {
10-
"uri": "sbr:6913260299"
10+
"uri": "sbr:7196076129"
1111
}
1212
}
1313
}

build/mapping.conf.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@
400400
"7083802536": "https://devtools-registry.s3.yandex.net/7083802536",
401401
"7120328912": "https://devtools-registry.s3.yandex.net/7120328912",
402402
"7120353733": "https://devtools-registry.s3.yandex.net/7120353733",
403-
"7171156703": "https://devtools-registry.s3.yandex.net/7171156703",
404-
"7171170069": "https://devtools-registry.s3.yandex.net/7171170069",
405403
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
406404
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
407405
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -470,6 +468,7 @@
470468
"6713117210": "https://devtools-registry.s3.yandex.net/6713117210",
471469
"6767780570": "https://devtools-registry.s3.yandex.net/6767780570",
472470
"6913307396": "https://devtools-registry.s3.yandex.net/6913307396",
471+
"7196092605": "https://devtools-registry.s3.yandex.net/7196092605",
473472
"5811823398": "https://devtools-registry.s3.yandex.net/5811823398",
474473
"5840611310": "https://devtools-registry.s3.yandex.net/5840611310",
475474
"5860185593": "https://devtools-registry.s3.yandex.net/5860185593",
@@ -491,6 +490,7 @@
491490
"6713113801": "https://devtools-registry.s3.yandex.net/6713113801",
492491
"6767778005": "https://devtools-registry.s3.yandex.net/6767778005",
493492
"6913305359": "https://devtools-registry.s3.yandex.net/6913305359",
493+
"7196092155": "https://devtools-registry.s3.yandex.net/7196092155",
494494
"5811822876": "https://devtools-registry.s3.yandex.net/5811822876",
495495
"5840610640": "https://devtools-registry.s3.yandex.net/5840610640",
496496
"5860184285": "https://devtools-registry.s3.yandex.net/5860184285",
@@ -512,6 +512,7 @@
512512
"6713110487": "https://devtools-registry.s3.yandex.net/6713110487",
513513
"6767775474": "https://devtools-registry.s3.yandex.net/6767775474",
514514
"6913303010": "https://devtools-registry.s3.yandex.net/6913303010",
515+
"7196091589": "https://devtools-registry.s3.yandex.net/7196091589",
515516
"5766172292": "https://devtools-registry.s3.yandex.net/5766172292",
516517
"5805431504": "https://devtools-registry.s3.yandex.net/5805431504",
517518
"5829027626": "https://devtools-registry.s3.yandex.net/5829027626",
@@ -808,6 +809,9 @@
808809
"6990868751": "https://devtools-registry.s3.yandex.net/6990868751",
809810
"6990860705": "https://devtools-registry.s3.yandex.net/6990860705",
810811
"6990881789": "https://devtools-registry.s3.yandex.net/6990881789",
812+
"7193803465": "https://devtools-registry.s3.yandex.net/7193803465",
813+
"7193800506": "https://devtools-registry.s3.yandex.net/7193800506",
814+
"7193813071": "https://devtools-registry.s3.yandex.net/7193813071",
811815
"3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
812816
"3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
813817
"3064614561": "https://devtools-registry.s3.yandex.net/3064614561",
@@ -1303,8 +1307,6 @@
13031307
"7083802536": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13041308
"7120328912": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13051309
"7120353733": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1306-
"7171156703": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1307-
"7171170069": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13081310
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
13091311
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
13101312
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1373,6 +1375,7 @@
13731375
"6713117210": "devtools/yexport/bin/yexport for darwin",
13741376
"6767780570": "devtools/yexport/bin/yexport for darwin",
13751377
"6913307396": "devtools/yexport/bin/yexport for darwin",
1378+
"7196092605": "devtools/yexport/bin/yexport for darwin",
13761379
"5811823398": "devtools/yexport/bin/yexport for darwin-arm64",
13771380
"5840611310": "devtools/yexport/bin/yexport for darwin-arm64",
13781381
"5860185593": "devtools/yexport/bin/yexport for darwin-arm64",
@@ -1394,6 +1397,7 @@
13941397
"6713113801": "devtools/yexport/bin/yexport for darwin-arm64",
13951398
"6767778005": "devtools/yexport/bin/yexport for darwin-arm64",
13961399
"6913305359": "devtools/yexport/bin/yexport for darwin-arm64",
1400+
"7196092155": "devtools/yexport/bin/yexport for darwin-arm64",
13971401
"5811822876": "devtools/yexport/bin/yexport for linux",
13981402
"5840610640": "devtools/yexport/bin/yexport for linux",
13991403
"5860184285": "devtools/yexport/bin/yexport for linux",
@@ -1415,6 +1419,7 @@
14151419
"6713110487": "devtools/yexport/bin/yexport for linux",
14161420
"6767775474": "devtools/yexport/bin/yexport for linux",
14171421
"6913303010": "devtools/yexport/bin/yexport for linux",
1422+
"7196091589": "devtools/yexport/bin/yexport for linux",
14181423
"5766172292": "devtools/ymake/bin/ymake for darwin",
14191424
"5805431504": "devtools/ymake/bin/ymake for darwin",
14201425
"5829027626": "devtools/ymake/bin/ymake for darwin",
@@ -1711,6 +1716,9 @@
17111716
"6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar",
17121717
"6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar",
17131718
"6990881789": "none-none-none-sandbox/backup/efc428e5-52a5-4a6f-8f0c-53f1d255efea/yfm-docs.tar",
1719+
"7193803465": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/17df2ad2-24bc-49e8-8909-b58685dac393/yfm-docs.tar",
1720+
"7193800506": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/9be8ed55-d7f8-4029-a7fd-fbfa072b896f/yfm-docs.tar",
1721+
"7193813071": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/b6531a79-b803-4672-a9e9-f9f348009f5f/yfm-docs.tar",
17141722
"3167009386": "openjdk 11.0.15 vanilla for darwin",
17151723
"3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
17161724
"3064614561": "openjdk 11.0.15 vanilla 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:7171168461)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120352053)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171167386)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120351367)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171170069)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120353733)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171166397)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120350948)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171169193)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120352672)
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:7171155340)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120327883)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171154530)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120327375)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171156703)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120328912)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171153757)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120326904)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7171155976)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7120328512)
1111

1212
ENDIF()

build/platform/yfm/ya.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ENDIF()
66

77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
88
YFM_TOOL
9-
sbr:6990868751 FOR DARWIN-ARM64
10-
sbr:6990868751 FOR DARWIN
11-
sbr:6990860705 FOR LINUX
12-
sbr:6990881789 FOR WIN32
9+
sbr:7193813071 FOR DARWIN-ARM64
10+
sbr:7193813071 FOR DARWIN
11+
sbr:7193800506 FOR LINUX
12+
sbr:7193803465 FOR WIN32
1313
)
1414

1515
END()

0 commit comments

Comments
 (0)