Skip to content

Commit 2bd1349

Browse files
ydbotydbot
committed
Sync branches 251125-0051
2 parents 9c0c0f6 + 5c5ca78 commit 2bd1349

File tree

51 files changed

+736
-154
lines changed

Some content is hidden

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

51 files changed

+736
-154
lines changed

‎build/conf/custom_lint.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ YAML_LINTER_DEFAULT_CONFIGS=build/config/tests/yaml_style/default_configs.json
33

44

55
# tag:lint tag:internal
6-
macro _CUSTOM_LINT_FILES(GLOB_VAR, EXT, DIRS[], DIRS_RECURSE[]) {
7-
_GLOB(${GLOB_VAR} ${suf=/*.(${EXT}):DIRS} ${suf=/**/*.(${EXT}):DIRS_RECURSE} ${suf=/**/ya.make:DIRS_RECURSE} ${suf=/ya.make:DIRS} EXCLUDE ya.make RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000 SKIPPED_MIN_MATCHES 2000 SKIPPED_ERROR_PERCENT 90)
6+
macro _CUSTOM_LINT_FILES(GLOB_VAR, EXT, EXCLUDE[], DIRS[], DIRS_RECURSE[]) {
7+
_GLOB(${GLOB_VAR} ${suf=/*.(${EXT}):DIRS} ${suf=/**/*.(${EXT}):DIRS_RECURSE} ${suf=/**/ya.make:DIRS_RECURSE} ${suf=/ya.make:DIRS} EXCLUDE ya.make canondata/** ${EXCLUDE} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000 SKIPPED_MIN_MATCHES 2000 SKIPPED_ERROR_PERCENT 90)
88
}
99

1010
# tag:lint tag:test
@@ -24,7 +24,7 @@ macro STYLE_YAML(DIRS[], DIRS_RECURSE[]) {
2424
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${YAML_LINTER_DEFAULT_CONFIGS})
2525
SET(_VAR_YAML_LINT_FILES_SALT __DIRS__ ${DIRS} __DIRS_RECURSE__ ${DIRS_RECURSE})
2626
SET(_CUSTOM_YAML_LINT_FILES_GLOB uniq_yaml_lint_files_${hash:_VAR_YAML_LINT_FILES_SALT})
27-
_CUSTOM_LINT_FILES(${_CUSTOM_YAML_LINT_FILES_GLOB} yaml|yml DIRS .${pre=/:DIRS} DIRS_RECURSE $DIRS_RECURSE)
27+
_CUSTOM_LINT_FILES(${_CUSTOM_YAML_LINT_FILES_GLOB} yaml|yml EXCLUDE **/(a|t).yaml DIRS .${pre=/:DIRS} DIRS_RECURSE $DIRS_RECURSE)
2828
_ADD_CUSTOM_EXPLICIT_LINTER_CHECK(NAME yamlfmt WRAPPER_SCRIPT tools/yamlfmt_linter/wrapper.py DEFAULT_CONFIGS $YAML_LINTER_DEFAULT_CONFIGS FILES ${${_CUSTOM_YAML_LINT_FILES_GLOB}})
2929
}
3030

‎build/conf/proto.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,8 @@ macro USE_JAVALITE() {
529529
}
530530

531531
# tag:proto tag:java-specific
532-
JAVA_PROTO_COMPILER_VERSION = 3.25.5
533-
JAVA_PROTO_RUNTIME_VERSION = 3.25.5
532+
JAVA_PROTO_COMPILER_VERSION = 4.33.0
533+
JAVA_PROTO_RUNTIME_VERSION = 4.33.0
534534
JAVA_PROTO_COMMON_VERSION = 2.53.0
535535
JAVA_GRPC_VERSION = 1.51.0
536536
KOTLIN_GRPC_VERSION = 1.3.1

‎build/conf/settings.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ when ($AUTOCHECK == "yes") {
2424
PIC_NO_PIE=yes
2525
}
2626

27-
when ($OS_LINUX == "yes") {
27+
when ($OS_LINUX == "yes" || $OS_DARWIN == "yes") {
2828
YMAKE_USE_OBJCOPY=yes
2929
}
3030

‎build/conf/ts/ts.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ NOTS_TOOL_COMMON_BUILDER_ARGS=\
7676
ERM_PACKAGES_PATH=devtools/frontend_build_platform/erm/erm-packages.json
7777

7878
TS_EXCLUDE_DIR_GLOB=(.idea|.vscode|node_modules)/**/*
79-
TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|\${join=|:WEBPACK_OUTPUT_DIR}|\${join=|:TS_NEXT_OUTPUT_DIR}|$VITE_OUTPUT_DIR)/**/*
79+
TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|.next|\${join=|:WEBPACK_OUTPUT_DIR}|\${join=|:TS_NEXT_OUTPUT_DIR}|$VITE_OUTPUT_DIR)/**/*
8080

8181
TS_GLOB_EXCLUDE_ADDITIONAL=
8282

‎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:10321547993"
4+
"uri": "sbr:10360711939"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:10321545651"
7+
"uri": "sbr:10360709700"
88
},
99
"linux": {
10-
"uri": "sbr:10321552121"
10+
"uri": "sbr:10360716500"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:10321543589"
13+
"uri": "sbr:10360706951"
1414
},
1515
"win32": {
16-
"uri": "sbr:10321549998"
16+
"uri": "sbr:10360714367"
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:10321551000"
4+
"uri": "sbr:10360723986"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:10321548731"
7+
"uri": "sbr:10360721846"
88
},
99
"linux": {
10-
"uri": "sbr:10321555222"
10+
"uri": "sbr:10360728571"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:10321546378"
13+
"uri": "sbr:10360719753"
1414
},
1515
"win32": {
16-
"uri": "sbr:10321552900"
16+
"uri": "sbr:10360726472"
1717
}
1818
}
1919
}

‎build/mapping.conf.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@
129129
"6385637991": "{registry_endpoint}/6385637991",
130130
"7804868939": "{registry_endpoint}/7804868939",
131131
"7804868953": "{registry_endpoint}/7804868953",
132+
"10028529831": "{registry_endpoint}/10028529831",
133+
"10028528878": "{registry_endpoint}/10028528878",
132134
"1841245955": "{registry_endpoint}/1841245955",
133135
"1841245849": "{registry_endpoint}/1841245849",
134136
"5424057306": "{registry_endpoint}/5424057306",
@@ -835,6 +837,7 @@
835837
"10288495360": "{registry_endpoint}/10288495360",
836838
"10309792955": "{registry_endpoint}/10309792955",
837839
"10321547993": "{registry_endpoint}/10321547993",
840+
"10360711939": "{registry_endpoint}/10360711939",
838841
"5766172292": "{registry_endpoint}/5766172292",
839842
"5805431504": "{registry_endpoint}/5805431504",
840843
"5829027626": "{registry_endpoint}/5829027626",
@@ -950,6 +953,7 @@
950953
"10288493132": "{registry_endpoint}/10288493132",
951954
"10309791432": "{registry_endpoint}/10309791432",
952955
"10321545651": "{registry_endpoint}/10321545651",
956+
"10360709700": "{registry_endpoint}/10360709700",
953957
"5766171800": "{registry_endpoint}/5766171800",
954958
"5805430761": "{registry_endpoint}/5805430761",
955959
"5829025456": "{registry_endpoint}/5829025456",
@@ -1065,6 +1069,7 @@
10651069
"10288499373": "{registry_endpoint}/10288499373",
10661070
"10309795967": "{registry_endpoint}/10309795967",
10671071
"10321552121": "{registry_endpoint}/10321552121",
1072+
"10360716500": "{registry_endpoint}/10360716500",
10681073
"5766173070": "{registry_endpoint}/5766173070",
10691074
"5805432830": "{registry_endpoint}/5805432830",
10701075
"5829031598": "{registry_endpoint}/5829031598",
@@ -1180,6 +1185,7 @@
11801185
"10288490918": "{registry_endpoint}/10288490918",
11811186
"10309789564": "{registry_endpoint}/10309789564",
11821187
"10321543589": "{registry_endpoint}/10321543589",
1188+
"10360706951": "{registry_endpoint}/10360706951",
11831189
"5766171341": "{registry_endpoint}/5766171341",
11841190
"5805430188": "{registry_endpoint}/5805430188",
11851191
"5829023352": "{registry_endpoint}/5829023352",
@@ -1295,6 +1301,7 @@
12951301
"10288497516": "{registry_endpoint}/10288497516",
12961302
"10309794402": "{registry_endpoint}/10309794402",
12971303
"10321549998": "{registry_endpoint}/10321549998",
1304+
"10360714367": "{registry_endpoint}/10360714367",
12981305
"8270821739": "{registry_endpoint}/8270821739",
12991306
"8295446553": "{registry_endpoint}/8295446553",
13001307
"8326170338": "{registry_endpoint}/8326170338",
@@ -1563,11 +1570,16 @@
15631570
"9470952456": "{registry_endpoint}/9470952456",
15641571
"9472684750": "{registry_endpoint}/9472684750",
15651572
"9827499366": "{registry_endpoint}/9827499366",
1573+
"10028627173": "{registry_endpoint}/10028627173",
15661574
"7805449449": "{registry_endpoint}/7805449449",
1575+
"10028625338": "{registry_endpoint}/10028625338",
15671576
"6391354461": "{registry_endpoint}/6391354461",
15681577
"7805449010": "{registry_endpoint}/7805449010",
1578+
"10028632776": "{registry_endpoint}/10028632776",
15691579
"7805450611": "{registry_endpoint}/7805450611",
1580+
"10028631106": "{registry_endpoint}/10028631106",
15701581
"7805450231": "{registry_endpoint}/7805450231",
1582+
"10028628791": "{registry_endpoint}/10028628791",
15711583
"7805449878": "{registry_endpoint}/7805449878",
15721584
"6990868751": "{registry_endpoint}/6990868751",
15731585
"6990860705": "{registry_endpoint}/6990860705",
@@ -1985,6 +1997,8 @@
19851997
"6385637991": "JAVA_LIBRARY-none-none-protobuf-java-3.25.3.jar",
19861998
"7804868939": "JAVA_LIBRARY-none-none-protobuf-java-3.25.5-sources.jar",
19871999
"7804868953": "JAVA_LIBRARY-none-none-protobuf-java-3.25.5.jar",
2000+
"10028529831": "JAVA_LIBRARY-none-none-protobuf-java-4.33.0-sources.jar",
2001+
"10028528878": "JAVA_LIBRARY-none-none-protobuf-java-4.33.0.jar",
19882002
"1841245955": "JAVA_LIBRARY-none-none-snakeyaml-1.27-sources.jar",
19892003
"1841245849": "JAVA_LIBRARY-none-none-snakeyaml-1.27.jar",
19902004
"5424057306": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.darwin-amd64.tar.gz",
@@ -2691,6 +2705,7 @@
26912705
"10288495360": "devtools/ymake/bin/ymake for darwin",
26922706
"10309792955": "devtools/ymake/bin/ymake for darwin",
26932707
"10321547993": "devtools/ymake/bin/ymake for darwin",
2708+
"10360711939": "devtools/ymake/bin/ymake for darwin",
26942709
"5766172292": "devtools/ymake/bin/ymake for darwin",
26952710
"5805431504": "devtools/ymake/bin/ymake for darwin",
26962711
"5829027626": "devtools/ymake/bin/ymake for darwin",
@@ -2806,6 +2821,7 @@
28062821
"10288493132": "devtools/ymake/bin/ymake for darwin-arm64",
28072822
"10309791432": "devtools/ymake/bin/ymake for darwin-arm64",
28082823
"10321545651": "devtools/ymake/bin/ymake for darwin-arm64",
2824+
"10360709700": "devtools/ymake/bin/ymake for darwin-arm64",
28092825
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
28102826
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
28112827
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2921,6 +2937,7 @@
29212937
"10288499373": "devtools/ymake/bin/ymake for linux",
29222938
"10309795967": "devtools/ymake/bin/ymake for linux",
29232939
"10321552121": "devtools/ymake/bin/ymake for linux",
2940+
"10360716500": "devtools/ymake/bin/ymake for linux",
29242941
"5766173070": "devtools/ymake/bin/ymake for linux",
29252942
"5805432830": "devtools/ymake/bin/ymake for linux",
29262943
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -3036,6 +3053,7 @@
30363053
"10288490918": "devtools/ymake/bin/ymake for linux-aarch64",
30373054
"10309789564": "devtools/ymake/bin/ymake for linux-aarch64",
30383055
"10321543589": "devtools/ymake/bin/ymake for linux-aarch64",
3056+
"10360706951": "devtools/ymake/bin/ymake for linux-aarch64",
30393057
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
30403058
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
30413059
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -3151,6 +3169,7 @@
31513169
"10288497516": "devtools/ymake/bin/ymake for win32",
31523170
"10309794402": "devtools/ymake/bin/ymake for win32",
31533171
"10321549998": "devtools/ymake/bin/ymake for win32",
3172+
"10360714367": "devtools/ymake/bin/ymake for win32",
31543173
"8270821739": "devtools/ymake/bin/ymake for win32",
31553174
"8295446553": "devtools/ymake/bin/ymake for win32",
31563175
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -3419,11 +3438,16 @@
34193438
"9470952456": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
34203439
"9472684750": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
34213440
"9827499366": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
3441+
"10028627173": "none-none-none-result_resources/protoc-linux-aarch_64.tgz",
34223442
"7805449449": "none-none-none-result_resources/protoc-linux-aarch_64.tgz",
3443+
"10028625338": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
34233444
"6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
34243445
"7805449010": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
3446+
"10028632776": "none-none-none-result_resources/protoc-osx-aarch_64.tgz",
34253447
"7805450611": "none-none-none-result_resources/protoc-osx-aarch_64.tgz",
3448+
"10028631106": "none-none-none-result_resources/protoc-osx-x86_64.tgz",
34263449
"7805450231": "none-none-none-result_resources/protoc-osx-x86_64.tgz",
3450+
"10028628791": "none-none-none-result_resources/protoc-win64.tgz",
34273451
"7805449878": "none-none-none-result_resources/protoc-win64.tgz",
34283452
"6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar",
34293453
"6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar",

contrib/java/com/google/protobuf/protobuf-java/3.25.5/pom.xml renamed to contrib/java/com/google/protobuf/protobuf-java/4.33.0/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-parent</artifactId>
7-
<version>3.25.5</version>
7+
<version>4.33.0</version>
88
</parent>
99

1010
<artifactId>protobuf-java</artifactId>

contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.dependency_management.inc renamed to contrib/java/com/google/protobuf/protobuf-java/4.33.0/ya.dependency_management.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INCLUDE(${ARCADIA_ROOT}/contrib/java/com/google/protobuf/protobuf-parent/3.25.5/ya.dependency_management.inc)
1+
INCLUDE(${ARCADIA_ROOT}/contrib/java/com/google/protobuf/protobuf-parent/4.33.0/ya.dependency_management.inc)

contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.make renamed to contrib/java/com/google/protobuf/protobuf-java/4.33.0/ya.make

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
JAVA_CONTRIB()
22

3-
VERSION(3.25.5)
3+
VERSION(4.33.0)
44

55
LICENSE(BSD-3-Clause)
66

77
ORIGINAL_SOURCE(https://repo1.maven.org/maven2)
88

9-
JAR_RESOURCE(7804868953)
9+
JAR_RESOURCE(10028528878)
1010

11-
SRC_RESOURCE(7804868939)
11+
SRC_RESOURCE(10028529831)
1212

1313
END()

0 commit comments

Comments
 (0)