Skip to content

Commit 1dc0239

Browse files
alexv-smirnovalexv-smirnov
authored
Merge 0032585 into ad0b833 
2 parents ad0b833 + 0032585 commit 1dc0239

File tree

165 files changed

+2825
-2403
lines changed

Some content is hidden

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

165 files changed

+2825
-2403
lines changed

‎build/conf/autoincludes.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[
22
"devtools/ya",
33
"library/cpp/geo",
4-
"util"
4+
"util",
5+
"yql/essentials"
56
]
67

‎build/conf/java.conf

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
404404
SET(VAR_SALT $SRCDIR $Globs $EXCLUDE $PACKAGE_PREFIX $RESOURCES $FILES)
405405
SET(JAR_SRCS_GLOB uniq_${hash:VAR_SALT})
406406
_LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE})
407-
SET_APPEND(LINT_JAVA_SOURCES \${rootrel;input;ext=.java:${JAR_SRCS_GLOB}})
407+
SET_APPEND(LINT_JAVA_SOURCES \${rootrel;ext=.java;input:${JAR_SRCS_GLOB}})
408408
SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES})
409409
_FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt)
410410
_FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_JSOURCES ${quo:SRCDIR} ${BINDIR}/src ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt)
@@ -503,7 +503,7 @@ macro JAR_ANNOTATION_PROCESSOR(Classes...) {
503503

504504
# tag:java-specific
505505
macro _JAR_ANN_PROC_OPTS(Classes...) {
506-
.CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes} $_USE_ANNOTATION_PROCESSOR_OPT
506+
.CMD=$_JAR_ANN_PROC_OPT_PREFIX ${hideempty;join=,:Classes} $_USE_ANNOTATION_PROCESSOR_OPT
507507
}
508508

509509
# tag:java-specific
@@ -531,7 +531,8 @@ macro _NOOP_MACRO(Args...) {
531531
# tag:java-specific
532532
module _JAR_BASE: _BARE_UNIT {
533533
.NODE_TYPE=Bundle
534-
.CMD=TOUCH_UNIT
534+
.CMD=$TOUCH_UNIT
535+
.STRUCT_CMD=yes
535536
.PEERDIR_POLICY=as_build_from
536537
.FINAL_TARGET=no
537538
.ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -581,7 +582,7 @@ JAR_RESOURCE_ID=
581582
SRC_RESOURCE_ID=
582583
FETCH_SRCS_JAR=
583584
FETCH_TARGET_JAR=
584-
FETCH_CONTRIB_JAR=${hide:JAVA_FAKEID} $FETCH_TARGET_JAR $FETCH_SRCS_JAR
585+
FETCH_CONTRIB_JAR=${hide:JAVA_FAKEID} && $FETCH_TARGET_JAR && $FETCH_SRCS_JAR
585586

586587
# tag:java-specific
587588
macro JAR_RESOURCE(Id) {
@@ -613,14 +614,14 @@ _JAVA_CONTRIB_SEM= \
613614

614615
# tag:java-specific
615616
module JAVA_CONTRIB: _JAR_BASE {
616-
.CMD=FETCH_CONTRIB_JAR
617+
.CMD=$FETCH_CONTRIB_JAR
617618
.PEERDIR_POLICY=as_include
618619
.SEM=_JAVA_CONTRIB_SEM
619620
.FINAL_TARGET=yes
620621
.GLOBAL=MAVEN_EXPORT_COORDS
621622

622623
when ($JAR_RESOURCE_ID) {
623-
FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
624+
FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
624625
}
625626
otherwise {
626627
when ($LOCAL_JAR_PATH) {
@@ -770,14 +771,14 @@ macro _ADD_OPTS_IF_NON_EMPTY(Opt, Args...) {
770771
.CMD=${pre=$Opt :Args}
771772
}
772773
macro _ADD_GEN_POM_FROM_COORD_FILES_ARGS(Deps...) {
773-
.CMD=${pre=--deps-coords ;ext=.jar;suf=.mvn_coords:Deps}
774+
.CMD=${pre=--deps-coords ;suf=.mvn_coords;ext=.jar:Deps}
774775
}
775776

776777
MAVEN_BIN=$MAVEN_RESOURCE_GLOBAL/bin/mvn
777778

778779
MAVEN_EXPORT_OUT_DIR_FLAG=$_ADD_OPTS_IF_NON_EMPTY(--output-dir ${MAVEN_EXPORT_OUT_DIR})
779780
MAVEN_EXPORT_SOURCE_DIRS=$_ADD_OPTS_IF_NON_EMPTY(--source-dirs ${ALL_SRCDIRS})
780-
MAVEN_EXPORT_DEPS_COORS=$_ADD_GEN_POM_FROM_COORD_FILES_ARGS(${MANAGED_PEERS_CLOSURE})
781+
MAVEN_EXPORT_DEPS_COORS=$_ADD_GEN_POM_FROM_COORD_FILES_ARGS($MANAGED_PEERS_CLOSURE)
781782
MAVEN_EXPORT_OUT_DIR=
782783

783784
MAVEN_EXPORT=no
@@ -1010,7 +1011,7 @@ _BUILD_PROTO_JAR_SEM= \
10101011
### Reimplementation of the JAVA_LIBRARY with ymake.core.conf and ymake based dependency management
10111012
module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
10121013
.EXTS=.jsrc .java .jar .mf .gentar .kt
1013-
.CMD=LINK_JAR
1014+
.CMD=$LINK_JAR
10141015
.SEM=_BUILD_JAR_SEM
10151016
.FINAL_TARGET=yes
10161017
.ALIASES=JAVA_SRCS=FULL_JAVA_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
@@ -1047,7 +1048,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
10471048
# For Kapt usage see: https://kotlinlang.org/docs/kapt.html#using-in-cli
10481049
# See for kapt.kotlin.generated: https://github.com/JetBrains/kotlin/blob/master/plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt
10491050
_KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.24"} $KT_KAPT_PLUGIN_OPTS
1050-
_RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} ${pre=--ap-classpath :KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
1051+
_RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} --ap-classpath ${KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
10511052
_APPEND_KAPT_GENERATED_SRCS=$YMAKE_PYTHON3 ${input:"build/scripts/resolve_java_srcs.py"} -d $KT_KAPT_SOURCES_DIR --include-patterns '**/*.java' '**/*.kt' --resolve-kotlin --append -s ${BINDIR}/all-java.srclst -k $KT_SRCLIST -r ${BINDIR}/not-used.txt
10521053

10531054
ALL_KT_COMMANDS+=&& $_RUN_KAPT && $_APPEND_KAPT_GENERATED_SRCS
@@ -1179,7 +1180,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
11791180
# tag:java-specific
11801181
_SCRIPTGEN_FLAGS=
11811182
macro _GEN_JAVA_SCRIPT_IMPL(Out, Template, Props...) {
1182-
.CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${join;pre="::";nopath;ext=.jar:MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW_VALUE=${ENABLE_PREVIEW_VALUE} $Props
1183+
.CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${join=;pre=\:\:;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} -D MAIN_CLASS=${_JAR_MAIN_CLASS} -D ENABLE_PREVIEW_VALUE=${ENABLE_PREVIEW_VALUE} $Props
11831184
}
11841185

11851186
# tag:java-specific
@@ -1202,12 +1203,17 @@ when ($HOST_OS_WINDOWS == "yes") {
12021203
GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:_GEN_JAVA_RUN_SH_OUTPUT} \
12031204
-D GENERATE_DEFAULT_RUNNER=yes \
12041205
-D JAR_NAME=${REALPRJNAME}.jar \
1205-
-D CLASSPATH=${join;pre="::";nopath:MANAGED_PEERS_CLOSURE} \
1206+
-D CLASSPATH=${join=;pre=\:\:;nopath:MANAGED_PEERS_CLOSURE} \
12061207
-D PROJECT_DIR=${REALPRJNAME} \
12071208
-D JAR_BASENAME=${REALPRJNAME} \
12081209
-D MAIN_CLASS=${_JAR_MAIN_CLASS} \
12091210
-D ENABLE_PREVIEW=${ENABLE_PREVIEW_VALUE}
12101211
GEN_RUN_CP=${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${qe;pre=$REALPRJNAME/;nopath:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
1212+
COLLECT_JAR_PROGRAM_CP__LATEOUT__=\
1213+
${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} \
1214+
${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} \
1215+
${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} \
1216+
${pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE}
12111217
COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir \
12121218
--ya-start-command-file \
12131219
${ext=.jar:MANAGED_PEERS_CLOSURE} \
@@ -1217,10 +1223,7 @@ COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir \
12171223
${_SOURCE_JARS} \
12181224
--ya-end-command-file \
12191225
${BINDIR}/${REALPRJNAME} \
1220-
${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} \
1221-
${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} \
1222-
${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} \
1223-
${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE}
1226+
${hide;late_out:COLLECT_JAR_PROGRAM_CP__LATEOUT__}
12241227
MAKE_JAR_PROGRAM_CPLST=${MAKE_JAVA_CLASSPATH_FILE} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${rootrel;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.jar:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file
12251228
TAR_CLASSPATH= && $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} ${output;pre=$MODULE_PREFIX;suf=.tar:REALPRJNAME} ${cwd;pre=$BINDIR/:REALPRJNAME}
12261229
DO_TAR_CLASSPATH=
@@ -1258,7 +1261,7 @@ macro _MARK_JAVA_PROG_WITH_SOURCES(Args...) {
12581261
# tag:java-specific
12591262
module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
12601263
.FINAL_TARGET=yes
1261-
.CMD=LINK_JAR_PROGRAM
1264+
.CMD=$LINK_JAR_PROGRAM
12621265
.SEM=_SEM_IGNORED
12631266
.ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES
12641267
.ALLOWED=WITH_JDK GENERATE_SCRIPT
@@ -1299,7 +1302,7 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
12991302
LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
13001303
module _JAR_TEST: _COMPILABLE_JAR_BASE {
13011304
.FINAL_TARGET=yes
1302-
.CMD=LINK_JAR_TEST
1305+
.CMD=$LINK_JAR_TEST
13031306
.DEFAULT_NAME_GENERATOR=FullPath
13041307
CONSUME_NON_MANAGEABLE_PEERS=yes
13051308

‎build/conf/proto.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ otherwise {
508508
KOTLIN_PROTO_FLAGS=
509509
# tag:proto tag:java-specific
510510
macro _JAVA_PROTO_CMD(File) {
511-
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID}
511+
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${hide;kv:"p PB"} ${hide;kv:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID} ${hide:"UID_BANHAMMER"}
512512
.SEM=proto_files ${input;rootrel:File} ${hide;output:File.jsrc}
513513
}
514514

‎build/export_generators/cmake/conanfile.py.jinja

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ class App(ConanFile):
3333
{%- endif -%}
3434

3535
{%- if (has_conan_os_depends_requires) -%}
36-
{%- for conan_os_depend in conan.os_depends|selectattr('requires') %}
37-
{%- if (conan_os_depend.requires|length) %}
38-
if self.settings.os == "{{ conan_os_depend.os }}":
39-
{%- for conan_require in conan_os_depend.requires %}
40-
self.requires("{{ conan_require }}")
36+
{%- set oses = conan.os_depends|selectattr('os')|map(attribute='os')|unique -%}
37+
{%- for os in oses %}
38+
{%- set os_requires = conan.os_depends|selectattr('os', 'eq', os)|selectattr('requires')|map(attribute='requires')|sum|unique -%}
39+
{%- if (os_requires|length) %}
40+
if self.settings.os == "{{ os }}":
41+
{%- for os_require in os_requires %}
42+
self.requires("{{ os_require }}")
4143
{%- endfor -%}
4244
{%- endif -%}
4345
{%- endfor -%}
@@ -55,11 +57,13 @@ class App(ConanFile):
5557
{%- endif -%}
5658

5759
{%- if (has_conan_os_depends_tool_requires) -%}
58-
{%- for conan_os_depend in conan.os_depends|selectattr('tool_requires') %}
59-
{%- if (conan_os_depend.tool_requires|length) %}
60-
if self.settings.os == "{{ conan_os_depend.os }}":
61-
{%- for conan_tool_require in conan_os_depend.tool_requires %}
62-
self.tool_requires("{{ conan_tool_require }}")
60+
{%- set oses = conan.os_depends|selectattr('os')|map(attribute='os')|unique -%}
61+
{%- for os in oses %}
62+
{%- set os_tool_requires = conan.os_depends|selectattr('os', 'eq', os)|selectattr('tool_requires')|map(attribute='tool_requires')|sum|unique -%}
63+
{%- if (os_tool_requires|length) %}
64+
if self.settings.os == "{{ os }}":
65+
{%- for os_tool_require in os_tool_requires %}
66+
self.requires("{{ os_tool_require }}")
6367
{%- endfor -%}
6468
{%- endif -%}
6569
{%- endfor -%}

‎build/external_resources/ymake/public.resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8103757184"
4+
"uri": "sbr:8157966268"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8103755745"
7+
"uri": "sbr:8157965432"
88
},
99
"linux": {
10-
"uri": "sbr:8103760334"
10+
"uri": "sbr:8157967911"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8103754551"
13+
"uri": "sbr:8157964700"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:8103758621"
16+
"uri": "sbr:8157967266"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8103761804"
4+
"uri": "sbr:8157959616"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8103760168"
7+
"uri": "sbr:8157958728"
88
},
99
"linux": {
10-
"uri": "sbr:8103765600"
10+
"uri": "sbr:8157961256"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8103758578"
13+
"uri": "sbr:8157958024"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:8103763594"
16+
"uri": "sbr:8157960421"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@
509509
"8029671029": "{registry_endpoint}/8029671029",
510510
"8067063302": "{registry_endpoint}/8067063302",
511511
"8119415565": "{registry_endpoint}/8119415565",
512+
"8161441586": "{registry_endpoint}/8161441586",
512513
"5486731632": "{registry_endpoint}/5486731632",
513514
"5514350352": "{registry_endpoint}/5514350352",
514515
"5514360398": "{registry_endpoint}/5514360398",
@@ -701,6 +702,7 @@
701702
"8000013577": "{registry_endpoint}/8000013577",
702703
"8069587979": "{registry_endpoint}/8069587979",
703704
"8103757184": "{registry_endpoint}/8103757184",
705+
"8157966268": "{registry_endpoint}/8157966268",
704706
"5766171800": "{registry_endpoint}/5766171800",
705707
"5805430761": "{registry_endpoint}/5805430761",
706708
"5829025456": "{registry_endpoint}/5829025456",
@@ -768,6 +770,7 @@
768770
"8000012780": "{registry_endpoint}/8000012780",
769771
"8069587058": "{registry_endpoint}/8069587058",
770772
"8103755745": "{registry_endpoint}/8103755745",
773+
"8157965432": "{registry_endpoint}/8157965432",
771774
"5766173070": "{registry_endpoint}/5766173070",
772775
"5805432830": "{registry_endpoint}/5805432830",
773776
"5829031598": "{registry_endpoint}/5829031598",
@@ -835,6 +838,7 @@
835838
"8000014871": "{registry_endpoint}/8000014871",
836839
"8069590186": "{registry_endpoint}/8069590186",
837840
"8103760334": "{registry_endpoint}/8103760334",
841+
"8157967911": "{registry_endpoint}/8157967911",
838842
"5766171341": "{registry_endpoint}/5766171341",
839843
"5805430188": "{registry_endpoint}/5805430188",
840844
"5829023352": "{registry_endpoint}/5829023352",
@@ -902,6 +906,7 @@
902906
"8000012216": "{registry_endpoint}/8000012216",
903907
"8069586009": "{registry_endpoint}/8069586009",
904908
"8103754551": "{registry_endpoint}/8103754551",
909+
"8157964700": "{registry_endpoint}/8157964700",
905910
"5766172695": "{registry_endpoint}/5766172695",
906911
"5805432230": "{registry_endpoint}/5805432230",
907912
"5829029743": "{registry_endpoint}/5829029743",
@@ -969,6 +974,7 @@
969974
"8000014239": "{registry_endpoint}/8000014239",
970975
"8069588665": "{registry_endpoint}/8069588665",
971976
"8103758621": "{registry_endpoint}/8103758621",
977+
"8157967266": "{registry_endpoint}/8157967266",
972978
"4307890075": "{registry_endpoint}/4307890075",
973979
"5517245192": "{registry_endpoint}/5517245192",
974980
"4307901240": "{registry_endpoint}/4307901240",
@@ -1763,6 +1769,7 @@
17631769
"8029671029": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17641770
"8067063302": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17651771
"8119415565": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1772+
"8161441586": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17661773
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17671774
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17681775
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1955,6 +1962,7 @@
19551962
"8000013577": "devtools/ymake/bin/ymake for darwin",
19561963
"8069587979": "devtools/ymake/bin/ymake for darwin",
19571964
"8103757184": "devtools/ymake/bin/ymake for darwin",
1965+
"8157966268": "devtools/ymake/bin/ymake for darwin",
19581966
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
19591967
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
19601968
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2022,6 +2030,7 @@
20222030
"8000012780": "devtools/ymake/bin/ymake for darwin-arm64",
20232031
"8069587058": "devtools/ymake/bin/ymake for darwin-arm64",
20242032
"8103755745": "devtools/ymake/bin/ymake for darwin-arm64",
2033+
"8157965432": "devtools/ymake/bin/ymake for darwin-arm64",
20252034
"5766173070": "devtools/ymake/bin/ymake for linux",
20262035
"5805432830": "devtools/ymake/bin/ymake for linux",
20272036
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2089,6 +2098,7 @@
20892098
"8000014871": "devtools/ymake/bin/ymake for linux",
20902099
"8069590186": "devtools/ymake/bin/ymake for linux",
20912100
"8103760334": "devtools/ymake/bin/ymake for linux",
2101+
"8157967911": "devtools/ymake/bin/ymake for linux",
20922102
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
20932103
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
20942104
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2156,6 +2166,7 @@
21562166
"8000012216": "devtools/ymake/bin/ymake for linux-aarch64",
21572167
"8069586009": "devtools/ymake/bin/ymake for linux-aarch64",
21582168
"8103754551": "devtools/ymake/bin/ymake for linux-aarch64",
2169+
"8157964700": "devtools/ymake/bin/ymake for linux-aarch64",
21592170
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
21602171
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
21612172
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -2223,6 +2234,7 @@
22232234
"8000014239": "devtools/ymake/bin/ymake for win32-clang-cl",
22242235
"8069588665": "devtools/ymake/bin/ymake for win32-clang-cl",
22252236
"8103758621": "devtools/ymake/bin/ymake for win32-clang-cl",
2237+
"8157967266": "devtools/ymake/bin/ymake for win32-clang-cl",
22262238
"4307890075": "flake8_linter for linux",
22272239
"5517245192": "flake8_linter for linux",
22282240
"4307901240": "flake8_linter for linux-aarch64",

‎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:8119446934)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161442120)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119444678)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161441534)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119452256)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161443391)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119442724)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161440859)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8119449312)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8161442654)
1111

1212
ENDIF()

0 commit comments

Comments
 (0)