Skip to content

Commit 3a2629a

Browse files
authored
Merge branch 'ydb-platform:main' into YQ_3617
2 parents 3e257cf + 2a0bfb0 commit 3a2629a

File tree

1,424 files changed

+37349
-21000
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,424 files changed

+37349
-21000
lines changed

.github/config/muted_ya.txt

Lines changed: 4 additions & 187 deletions
Large diffs are not rendered by default.

.github/workflows/docs_release.yaml

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,53 @@ on:
1010
workflow_dispatch:
1111

1212
jobs:
13-
release:
13+
build:
14+
runs-on: ubuntu-latest
1415
concurrency:
1516
group: release-documentation-${{ github.ref }}
1617
cancel-in-progress: true
17-
runs-on: ubuntu-latest
18+
permissions: write-all
1819
steps:
1920
- name: Checkout
2021
uses: actions/checkout@v4
22+
- name: Build
23+
uses: diplodoc-platform/docs-build-action@v3
24+
with:
25+
revision: "${{ github.sha }}"
26+
src-root: ${{ vars.SRC_ROOT }}
27+
upload:
28+
needs: build
29+
runs-on: ubuntu-latest
30+
concurrency:
31+
group: release-documentation-${{ github.ref }}
32+
cancel-in-progress: true
33+
permissions: write-all
34+
steps:
35+
- name: Upload
36+
uses: diplodoc-platform/docs-upload-action@v1
37+
with:
38+
github-token: ${{ secrets.GITHUB_TOKEN }}
39+
storage-bucket: ${{ secrets.DOCS_AWS_BUCKET }}
40+
storage-endpoint: ${{ vars.DOCS_AWS_ENDPOINT }}
41+
storage-access-key-id: ${{ secrets.DOCS_AWS_KEY_ID }}
42+
storage-secret-access-key: ${{ secrets.DOCS_AWS_SECRET_ACCESS_KEY }}
43+
storage-region: ${{ vars.DOCS_AWS_REGION }}
44+
release:
45+
needs: upload
46+
runs-on: ubuntu-latest
47+
concurrency:
48+
group: release-documentation-${{ github.ref }}
49+
cancel-in-progress: true
50+
steps:
2151
- name: Extract version
2252
shell: bash
2353
run: echo "version=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" | sed -e 's|stable-|v|g' -e 's|-|.|g' >> $GITHUB_OUTPUT
2454
id: extract_version
2555
- name: Release
26-
uses: diplodoc-platform/docs-release-action@v1
56+
uses: diplodoc-platform/docs-release-action@v2
2757
with:
2858
revision: "${{ github.sha }}"
2959
version: "${{ steps.extract_version.outputs.version }}"
30-
project-name: ${{ secrets.DOCS_PROJECT_NAME }}
31-
src-root: ${{ vars.SRC_ROOT }}
3260
storage-bucket: ${{ secrets.DOCS_AWS_BUCKET }}
33-
storage-endpoint: ${{ vars.DOCS_AWS_ENDPOINT }}
3461
storage-access-key-id: ${{ secrets.DOCS_AWS_KEY_ID }}
3562
storage-secret-access-key: ${{ secrets.DOCS_AWS_SECRET_ACCESS_KEY }}
36-
storage-region: ${{ vars.DOCS_AWS_REGION }}
37-
shared-storage-bucket: true

build/conf/autoincludes.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

build/conf/compilers/gnu_compiler.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,16 @@ when ($ARCH_XTENSA == "yes") {
7575
when ($OS_EMSCRIPTEN == "yes") {
7676
FSTACK=-fno-stack-protector
7777
CFLAGS+=-D__EMSCRIPTEN__
78+
}
79+
80+
when ($ARCH_WASM64 == "yes") {
7881
CFLAGS+=-D_LIBCPP_HAS_MUSL_LIBC
7982
}
8083

84+
when ($ARCH_WASM32 == "yes") {
85+
CFLAGS+=-D_musl_
86+
}
87+
8188
CFLAGS+=$_C_FLAGS $DEBUG_INFO_FLAGS $_C_FOPTIONS $C_WARNING_OPTS $GCC_PREPROCESSOR_OPTS $USER_CFLAGS $USER_CFLAGS_GLOBAL
8289
CXXFLAGS+=$CFLAGS $_STD_CXX $CXX_WARNING_OPTS $USER_CXXFLAGS $USER_CXXFLAGS_GLOBAL
8390
CONLYFLAGS+=$USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL

build/conf/java.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@ module JAVA_CONTRIB_PROXY: _JAR_BASE {
585585
.SEM=JAVA_CONTRIB_PROXY_SEM
586586

587587
_DONT_REQUIRE_LICENSE()
588+
WITHOUT_VERSION()
588589
}
589590

590591
# tag:java-specific

build/conf/proto.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ multimodule PROTO_LIBRARY {
796796

797797
module TS_PROTO: _TS_PROTO_IMPL {
798798
# opt-in. We don't want to have TS_PROTO by default
799-
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO) in ya.make
799+
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
800800
.INCLUDE_TAG=no
801801
.EPILOGUE=_TS_CONFIG_EPILOGUE
802802
.PEERDIRSELF=TS_PREPARE_DEPS

build/conf/python.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ module PY2TEST: PYTEST_BIN {
364364
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
365365
NO_CLANG_TIDY()
366366
_DONT_REQUIRE_LICENSE()
367+
WITHOUT_VERSION()
367368
}
368369

369370
# tag:python-specific tag:deprecated tag:test
@@ -406,11 +407,13 @@ multimodule PY3TEST {
406407

407408
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
408409
_DONT_REQUIRE_LICENSE()
410+
WITHOUT_VERSION()
409411
}
410412

411413
module PY3TEST_LIBRARY: PY3_LIBRARY {
412414
PEERDIR+=library/python/pytest
413415
_DONT_REQUIRE_LICENSE()
416+
WITHOUT_VERSION()
414417
}
415418
}
416419

@@ -1118,6 +1121,7 @@ multimodule PY23_TEST {
11181121
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py2test/result.json)
11191122

11201123
_DONT_REQUIRE_LICENSE()
1124+
WITHOUT_VERSION()
11211125
}
11221126
module PY3TEST_PROGRAM: PY3TEST_BIN {
11231127
.FINAL_TARGET=yes
@@ -1129,6 +1133,7 @@ multimodule PY23_TEST {
11291133
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py3test/result.json)
11301134

11311135
_DONT_REQUIRE_LICENSE()
1136+
WITHOUT_VERSION()
11321137
}
11331138

11341139
module PY3TEST_LIBRARY: PY3_LIBRARY {
@@ -1137,5 +1142,6 @@ multimodule PY23_TEST {
11371142
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
11381143

11391144
_DONT_REQUIRE_LICENSE()
1145+
WITHOUT_VERSION()
11401146
}
11411147
}

build/conf/settings.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ _FOLDABLE_VARS=\
129129

130130
ARCADIA_TEST_ROOT=../arcadia_tests_data/
131131
DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
132+
133+
AUTOINCLUDE_PATHS=build/conf/autoincludes.json

build/conf/ts/ts_proto.conf

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
_TS_PROTO_SRCS_FILES=
1+
_TS_PROTO_OPT=
22
_TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
33
&& $_TS_FILES_COPY_CMD \
44
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-ts-proto $NOTS_TOOL_COMMON_BUILDER_ARGS \
5+
${_TS_PROTO_OPT} \
56
--protoc-bin $PROTOC \
67
--proto-srcs $_TS_PROTO_SRCS_FILES \
78
--proto-paths ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE $_PROTO__INCLUDE $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH \
@@ -45,3 +46,22 @@ module _TS_PROTO_IMPL: _TS_BASE_UNIT {
4546
macro _TS_PROTO_SRCS(FILES...) {
4647
_SET_APPEND_WITH_DIRECTIVE(_TS_PROTO_SRCS_FILES input $FILES)
4748
}
49+
50+
### @usage: TS_PROTO_OPT(key1=value1 key2=value2)
51+
###
52+
### Overrides default options for `--ts_proto_opt`
53+
### ([supported options](https://github.com/stephenh/ts-proto?tab=readme-ov-file#supported-options)).
54+
###
55+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/PROTO_LIBRARY#ts_proto_opt
56+
###
57+
### @example
58+
###
59+
### TS_PROTO_OPT(env=browser)
60+
### TS_PROTO_OPT(
61+
### useJsonName=true
62+
### useJsonWireFormat=true
63+
### )
64+
###
65+
macro TS_PROTO_OPT(OPTS...) {
66+
SET_APPEND(_TS_PROTO_OPT ${pre=--ts-proto-opt :OPTS})
67+
}

build/conf/ts/ts_test.conf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,38 @@ module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE {
113113
_TS_TEST_FOR_CONFIGURE(playwright playwright.config.ts workspace_node_modules.tar)
114114
}
115115

116+
TS_TEST_PLAYWRIGHT_LARGE_CMD=$TOUCH_UNIT \
117+
&& ${cwd:BINDIR} $MOVE_FILE ${input:TS_TEST_NM} ${output:"workspace_node_modules.tar"} \
118+
${kv;hide:"p TSPW"} ${kv;hide:"pc magenta"}
119+
120+
### @usage: TS_TEST_PLAYWRIGHT_LARGE_FOR(Path)
121+
###
122+
### Defines testing module with playwright test runner.
123+
###
124+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TEST_PLAYWRIGHT_FOR
125+
###
126+
### @example
127+
###
128+
### TS_TEST_PLAYWRIGHT_LARGE_FOR(path/to/module)
129+
### TS_TEST_SRCS(../src)
130+
### TS_TEST_CONFIG(../playwright.config.js)
131+
### END()
132+
###
133+
module TS_TEST_PLAYWRIGHT_LARGE_FOR: _TS_TEST_BASE {
134+
.CMD=TS_TEST_PLAYWRIGHT_LARGE_CMD
135+
136+
# for multimodule peers we should choose TS
137+
SET(PEERDIR_TAGS TS)
138+
139+
# compatibility with old TS_TEST_SRCS
140+
SET(TS_TEST_EXTENSION (playwright|spec).(ts|js))
141+
142+
TS_TEST_DEPENDS_ON_BUILD()
143+
_DEPENDS_ON_MOD()
144+
_PEERDIR_TS_RESOURCE(nodejs playwright)
145+
_TS_TEST_FOR_CONFIGURE(playwright_large playwright.config.ts workspace_node_modules.tar)
146+
}
147+
116148
### # internal
117149
module _TS_TEST_BASE: _BARE_UNIT {
118150
# ignore SRCS macro

0 commit comments

Comments
 (0)