Skip to content

Commit 2c65657

Browse files
vladl2802vladl2802
authored
Merge branch 'ydb-platform:main' into implement-tpc-benchmarks-as-tests
2 parents a1e2644 + f828cc9 commit 2c65657

File tree

1,491 files changed

+33639
-9498
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,491 files changed

+33639
-9498
lines changed

‎.github/CODEOWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
/*.md @ydb-platform/docs
22

3+
/build @ydb-platform/ci
4+
/certs @ydb-platform/ci
5+
/contrib @ydb-platform/ci
6+
/devtools @ydb-platform/ci
7+
/library @ydb-platform/ci
8+
/scripts @ydb-platform/ci
9+
/tools @ydb-platform/ci
10+
/util @ydb-platform/ci
11+
/vendor @ydb-platform/ci
12+
/yt @ydb-platform/ci
13+
314
/ydb/core/fq/ @ydb-platform/fq
415
/ydb/core/public_http/ @ydb-platform/fq
516

‎.github/TESTOWNERS

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,96 @@
1-
# TEAM:@ydb-platform/docs
1+
#Docs @blinkov TEAM:@ydb-platform/docs
22
/*.md @ydb-platform/docs
33
/ydb/docs/ @ydb-platform/docs
44

5-
# YQL @ydb-platform/yql
5+
#YQL @vitstn @ydb-platform/yql
66
/ydb/library/yql/ @ydb-platform/yql
77
/ydb/library/yql/dq @ydb-platform/yql @ydb-platform/qp
88
/ydb/library/yql/yt @Krock21 @Krisha11 @zlobober @gritukan
99

10+
#Row Tables Development Team @azevaykin TEAM:@ydb-platform/datashard
11+
/ydb/core/scheme @ydb-platform/datashard
12+
/ydb/core/tablet_flat @ydb-platform/datashard
13+
/ydb/core/tx/datashard @ydb-platform/datashard
14+
/ydb/core/mon_alloc @ydb-platform/datashard
15+
/ydb/core/tx/coordinator @ydb-platform/datashard
1016

17+
#Column Tables Development Team @zverevgeny TEAM:@ydb-platform/cs
18+
/ydb/core/tx/columnshard @ydb-platform/cs
1119

12-
#Группа разработки строковых таблиц @azevaykin TEAM:?
13-
/ydb/core/tablet_flat @azevaykin
14-
/ydb/core/tx/datashard @azevaykin
15-
/ydb/core/mon_alloc @azevaykin
1620

17-
# Сoordinator
18-
/ydb/core/tx/coordinator @snaury
19-
20-
#Группа распределенной системной инфраструктуры @ijon TEAM:@ydb-platform/system-infra
21-
/ydb/core/mind/ @ydb-platform/system-infra
22-
/ydb/core/blob_depot @ydb-platform/system-infra
21+
#Distributed System Infrastructure Team @ijon TEAM:@ydb-platform/system-infra
22+
/ydb/core/mind/hive @ydb-platform/system-infra
2323
/ydb/core/tx/schemeshard @ydb-platform/system-infra
2424
/ydb/core/tx/columnshard @ivanmorozov333 @ydb-platform/system-infra
25-
/ydb/services/ydb/ @ydb-platform/system-infra
2625
/ydb/core/util @ydb-platform/system-infra
27-
/ydb/core/persqueue @ydb-platform/system-infra
2826
/ydb/core/client @ydb-platform/system-infra
2927
/ydb/core/engine @ydb-platform/system-infra
28+
/ydb/tests/functional/hive @ydb-platform/system-infra
29+
/ydb/core/tx/scheme_board @ydb-platform/system-infra
30+
/ydb/core/tx/scheme_cache @ydb-platform/system-infra
31+
/ydb/core/audit @ydb-platform/system-infra
32+
/ydb/core/security @ydb-platform/system-infra
33+
/ydb/core/health_check @ydb-platform/system-infra
34+
/ydb/library/aclib @ydb-platform/system-infra
35+
/ydb/mvp/oidc_proxy @ydb-platform/system-infra
36+
/ydb/tests/functional/audit @ydb-platform/system-infra
37+
/ydb/tests/functional/limits @ydb-platform/system-infra
38+
/ydb/tests/functional/scheme_shard @ydb-platform/system-infra
39+
/ydb/tests/functional/tenants @ydb-platform/system-infra
40+
/ydb/services/ydb/table_split_ut @ydb-platform/system-infra
3041

3142
#YDB Query Execution Team @gridnevvvit TEAM:@ydb-platform/qp
3243
/ydb/core/kqp @ydb-platform/qp
3344
#YDB Query Optimizer Team @pavelvelikhov TEAM:@ydb-platform/qp
3445
/ydb/tests/functional/canonical @ydb-platform/qp
46+
/ydb/tests/functional/suite_tests @ydb-platform/qp
47+
/ydb/tests/functional/clickbench @ydb-platform/qp
48+
/ydb/tests/functional/postgresql @ydb-platform/qp
3549

3650
#YDB Application Team @asmyasnikov TEAM:@ydb-platform/appteam
3751
/ydb/public/sdk @ydb-platform/appteam
3852
/ydb/tests/functional/ydb_cli @ydb-platform/appteam
3953
/ydb/public/lib/ydb_cli @ydb-platform/appteam
54+
/ydb/apps/ydb @ydb-platform/appteam
4055

4156
#YDB Engineering Team @maximyurchuk
42-
# - пока не понятно
57+
# - tbd
58+
59+
#Orphan components @spuchin @maximyurchuk @kirrysin @ydb-platform/duty
60+
/ydb/services/ydb @ydb-platform/duty
61+
/ydb/core/util @ydb-platform/duty
62+
/ydb/core/client @ydb-platform/duty
63+
/ydb/core/engine @ydb-platform/duty
4364

44-
#Группа разработки распределенного хранилища @the-ancient-1 TEAM:@ydb-platform/storage
65+
#Distributed Storage Team @the-ancient-1 TEAM:@ydb-platform/storage
4566
/ydb/core/blobstorage @ydb-platform/storage
4667
/ydb/core/mind/bscontroller @ydb-platform/storage
47-
48-
#Группа функциональности ядра @CyberROFL TEAM:@ydb-platform/core
49-
68+
/ydb/library/actors @ydb-platform/storage
69+
/ydb/core/actorlib_impl @ydb-platform/storage
70+
/ydb/core/keyvalue @ydb-platform/storage
71+
/ydb/core/test_tablet @ydb-platform/storage
72+
/ydb/core/blob_depot @ydb-platform/storage
73+
/ydb/core/erasure @ydb-platform/storage
74+
75+
#Core Functionality Team @CyberROFL TEAM:@ydb-platform/core
5076
/ydb/core/config/ut @ydb-platform/core
51-
/ydb/core/scheme @ydb-platform/core
5277
/ydb/core/cms @ydb-platform/core
5378
/ydb/tests/functional/cms @ydb-platform/core
79+
/ydb/core/quoter @ydb-platform/core
5480

55-
56-
#Группа разработки систем поставки данных / LogBroker @alexnick88 TEAM:@ydb-platform/topics
81+
#Data Delivery Systems Team / LogBroker @alexnick88 TEAM:@ydb-platform/topics
5782
/ydb/tests/functional/sqs @ydb-platform/Topics
5883
/ydb/core/kafka_proxy @ydb-platform/Topics
5984
/ydb/core/persqueue @ydb-platform/Topics
6085
/ydb/services/datastreams @ydb-platform/Topics
6186
/ydb/services/deprecated/persqueue_v0 @ydb-platform/Topics
6287
/ydb/services/persqueue_v1 @ydb-platform/Topics
88+
/ydb/core/ymq @ydb-platform/Topics
89+
/ydb/core/http_proxy @ydb-platform/Topics
6390

6491
#YDB Analytics TEAM:???
6592

66-
#Federative query TEAM:@ydb-platform/fq
93+
#Federative query @uzhastik TEAM:@ydb-platform/fq
6794
/ydb/tests/fq @ydb-platform/fq
6895
/ydb/core/fq/ @ydb-platform/fq
6996
/ydb/services/fq/ @ydb-platform/fq
@@ -74,7 +101,8 @@
74101
/ydb/library/yql/providers/s3 @ydb-platform/fq
75102
/ydb/library/yql/providers/solomon @ydb-platform/fq
76103
/ydb/core/public_http/ @ydb-platform/fq
104+
/ydb/core/kqp/ut/federated_query @ydb-platform/fq
77105

78106
#@ydb-platform/ui-backend
79107
/ydb/core/viewer @ydb-platform/ui-backend
80-
/ydb/core/protos/node_whiteboard.proto @ydb-platform/ui-backend
108+
/ydb/core/protos/node_whiteboard.proto @ydb-platform/ui-backend

‎.github/config/muted_ya.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ ydb/core/viewer/ut Viewer.TabletMerging
5252
ydb/core/viewer/ut Viewer.TabletMergingPacked
5353
ydb/library/actors/http/ut HttpProxy.TooLongHeader
5454
ydb/library/actors/http/ut sole*
55-
ydb/library/yql/providers/generic/connector/tests/datasource/ydb* *
5655
ydb/public/sdk/cpp/client/ydb_persqueue_core/ut [*/*]
5756
ydb/public/sdk/cpp/client/ydb_persqueue_core/ut RetryPolicy.TWriteSession_TestBrokenPolicy
5857
ydb/public/sdk/cpp/client/ydb_persqueue_public/ut RetryPolicy.TWriteSession_TestBrokenPolicy

‎.github/workflows/docs_build.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ jobs:
1212
cancel-in-progress: true
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Update integrated status
16-
shell: bash
17-
run: |
18-
curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{github.token}}" -H "X-GitHub-Api-Version: 2022-11-28" \
19-
https://api.github.com/repos/${{github.repository}}/statuses/${{github.event.pull_request.head.sha}} \
20-
-d '{"state":"pending","description":"Waiting for relevant checks to complete","context":"checks_integrated"}'
2115
- name: Checkout
2216
uses: actions/checkout@v3
2317
with:
@@ -27,9 +21,3 @@ jobs:
2721
with:
2822
revision: "pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}"
2923
src-root: "./ydb/docs"
30-
- name: Update integrated status
31-
shell: bash
32-
run: |
33-
curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{github.token}}" -H "X-GitHub-Api-Version: 2022-11-28" \
34-
https://api.github.com/repos/${{github.repository}}/statuses/${{github.event.pull_request.head.sha}} \
35-
-d '{"state":"success","description":"All checks completed","context":"checks_integrated"}'

‎.github/workflows/pr_check.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
- 'stable-*'
77
- 'stream-nb-*'
88
- '*-stable-*'
9-
paths-ignore:
10-
- 'ydb/docs/**'
119
types:
1210
- 'opened'
1311
- 'synchronize'
@@ -141,7 +139,7 @@ jobs:
141139
142140
let i = 0;
143141
144-
while (pr.mergeable == null || i >= 60) {
142+
while (pr.mergeable == null && i < 60) {
145143
console.log("get pull-request status");
146144
147145
let result = await github.rest.pulls.get({
@@ -160,6 +158,11 @@ jobs:
160158

161159
console.log("pr.mergeable=%o", pr.mergeable);
162160

161+
if (pr.mergeable === null) {
162+
core.setFailed("Unable to check if the PR is mergeable, please re-run the check.");
163+
return false;
164+
}
165+
163166
const { data: comments } = await github.rest.issues.listComments({
164167
issue_number: context.issue.number,
165168
owner: context.repo.owner,
@@ -168,7 +171,7 @@ jobs:
168171

169172
const commentToUpdate = comments.find(comment => comment.body.startsWith(header));
170173

171-
if (pr.mergeable === false) {
174+
if (!pr.mergeable) {
172175
let commentParams = {
173176
...context.repo,
174177
issue_number: context.issue.number,

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ __pycache__/
2626
*.pb.h
2727
*.pb.cc
2828

29+
# Other generated
30+
*.fbs.h
31+
2932
# MacOS specific
3033
.DS_Store
3134

‎build/conf/java.conf

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,17 @@ macro _JAR_ANN_PROC_OPTS(Classes...) {
468468
.CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes}
469469
}
470470

471+
# tag:java-specific
472+
_USE_ANNOTATION_PROCESSOR_OPT=
473+
_USE_ANNOTATION_PROCESSOR_SEM=
474+
### @usage: USE_ANNOTATION_PROCESSOR(AnnotationProcessor)
475+
###
476+
### Used to specify annotation processor for building JAVA_PROGRAM() and JAVA_LIBRARY().
477+
macro USE_ANNOTATION_PROCESSOR(AnnotationProcessor) {
478+
SET(_USE_ANNOTATION_PROCESSOR_OPT -processorpath @${tool:AnnotationProcessor}.cplist)
479+
SET(_USE_ANNOTATION_PROCESSOR_SEM && use_annotation_processor $AnnotationProcessor)
480+
}
481+
471482
# tag:java-specific
472483
macro _NOOP_MACRO(Args...) {
473484
ENABLE(UNUSED_MACRO)
@@ -698,7 +709,7 @@ macro _PACK_JAR_HELPER(Out) {
698709

699710
# tag:java-specific
700711
macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) {
701-
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${env:"LC_ALL=en_US.UTF-8"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} ${input;hide:"build/scripts/build_java_with_error_prone2.py"} ${input;hide:"build/scripts/setup_java_tmpdir.py"} --with-setup-java-tmpdir --sources-list ${BINDIR}/all-java.srclst ${RUN_JAVAC_ARGS} ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8
712+
.CMD=${cwd:ARCADIA_BUILD_ROOT} ${env:"LC_ALL=en_US.UTF-8"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} ${input;hide:"build/scripts/build_java_with_error_prone2.py"} ${input;hide:"build/scripts/setup_java_tmpdir.py"} --with-setup-java-tmpdir --sources-list ${BINDIR}/all-java.srclst ${RUN_JAVAC_ARGS} ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} ${_USE_ANNOTATION_PROCESSOR_OPT} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8
702713
}
703714

704715
# tag:java-specific
@@ -916,6 +927,7 @@ BUILD_JAR_SEM= \
916927
$_JAR_MAIN_SEM \
917928
$_GRADLE_EXPORT_PUBLISHING_SEM \
918929
$_ANN_PROCESSORS_SEM \
930+
$_USE_ANNOTATION_PROCESSOR_SEM \
919931
$_ENABLE_PREVIEW_SEM \
920932
$SEM_JAR_SOURCE_SET
921933

@@ -928,6 +940,7 @@ BUILD_PROTO_JAR_SEM= \
928940
&& consumer-type library \
929941
$_JAVAC_SEM \
930942
$_ANN_PROCESSORS_SEM \
943+
$_USE_ANNOTATION_PROCESSOR_SEM \
931944
$_ENABLE_PREVIEW_SEM \
932945
$_KOTLIN_SEM
933946

‎build/conf/proto.conf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,10 +634,15 @@ macro _GENERATE_PY_EVS_INTERNAL(FILES...) {
634634
###
635635
### TODO: proper implementation needed
636636
macro LIST_PROTO(TO="files.proto", Files...) {
637-
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files} && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;noext;suf=.pb.h:TO}
637+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files}
638+
_COMPILE_LIST_PROTO(${TO})
638639
_EXPOSE(${TO})
639640
}
640641

642+
macro _COMPILE_LIST_PROTO(SRC) {
643+
.CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${input;hide:SRC} ${output;noext;suf=.pb.h:SRC}
644+
}
645+
641646
# tag:proto
642647
macro _PROTO_DESC_RAWPROTO_CMD(File) {
643648
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}

‎build/conf/settings.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ REPORT_ALL_DUPSRC=yes
1616
DEPS_CACHE_CONTROL_UIDS_CACHE=yes
1717
INCLUDE_BLACKLIST_TO_CONF_HASH=no
1818
INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
19+
USE_GRAND_BYPASS=no
1920
USE_GLOBAL_CMD=yes
2021
YMAKE_USE_NEW_UIDS=yes
2122
USE_GRAPH_CHANGES_PREDICTOR=yes

‎build/conf/ts/node_modules.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ module NPM_CONTRIBS: _BARE_UNIT {
4646
###
4747
### @see [NPM_CONTRIBS()](#module_NPM_CONTRIBS)
4848
macro FROM_NPM_LOCKFILES(LOCKFILES...) {
49-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES)
49+
# SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES)
5050
# See implementation in build/plugins/nots.py
51-
_FROM_NPM_LOCKFILES($LOCKFILES)
51+
# _FROM_NPM_LOCKFILES($LOCKFILES)
52+
MESSAGE("NPM_CONTRIBS and FROM_NPM_LOCKFILES are disabled. Please exclude them from your build process")
5253
}
5354

5455
FROM_NPM_CWD=$ARCADIA_BUILD_ROOT/$NPM_CONTRIBS_PATH

‎build/conf/ts/ts_next.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
TS_NEXT_CONFIG_PATH=next.config.js
2+
TS_NEXT_COMMAND=build
23

34
### @usage: TS_NEXT_CONFIG(ConfigPath)
45
###
@@ -25,15 +26,21 @@ macro TS_NEXT_OUTPUT(DirName) {
2526
SET(TS_NEXT_OUTPUT_DIR $DirName)
2627
}
2728

29+
macro TS_NEXT_EXPERIMENTAL_COMPILE() {
30+
SET(TS_NEXT_COMMAND experimental-compile)
31+
}
32+
2833
TS_NEXT_CMD=$TOUCH_UNIT \
2934
&& $_TS_FILES_COPY_CMD \
3035
&& $ADD_VCS_INFO_FILE_CMD \
3136
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-next $NOTS_TOOL_COMMON_BUILDER_ARGS \
37+
--ts-next-command ${TS_NEXT_COMMAND} \
3238
--bundler-config-path ${input:TS_NEXT_CONFIG_PATH} \
3339
--output-dirs ${TS_NEXT_OUTPUT_DIR} \
3440
$_NODE_MODULES_INOUTS ${hide:PEERS} \
3541
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
3642
${output;hide:"package.json"} \
43+
${requirements;hide:"cpu:2"} \
3744
${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
3845

3946
### @usage: TS_NEXT([name])

‎build/conf/ts/ts_proto.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ _TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
99
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
1010
${output;hide:"package.json"} \
1111
${hide:PROTO_FAKEID} \
12+
${requirements;hide:"cpu:2"} \
1213
${kv;hide:"pc magenta"} ${kv;hide:"p TS_PRO"}
1314

1415

‎build/conf/ts/ts_tsc.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ TS_TSC_CMD=$TOUCH_UNIT \
44
$_NODE_MODULES_INOUTS ${hide:PEERS} \
55
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
66
${output;hide:"package.json"} \
7+
${requirements;hide:"cpu:2"} \
78
${kv;hide:"pc magenta"} ${kv;hide:"p TS_TSC"}
89

910
### @usage: TS_TSC([name])

‎build/conf/ts/ts_vite.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ TS_VITE_CMD=$TOUCH_UNIT \
4242
$_NODE_MODULES_INOUTS ${hide:PEERS} \
4343
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
4444
${output;hide:"package.json"} \
45+
${requirements;hide:"cpu:2"} \
4546
${kv;hide:"pc magenta"} ${kv;hide:"p TS_VIT"}
4647

4748
### @usage: TS_VITE([name])

‎build/conf/ts/ts_webpack.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
3939
$_NODE_MODULES_INOUTS ${hide:PEERS} \
4040
${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \
4141
${output;hide:"package.json"} \
42+
${requirements;hide:"cpu:2"} \
4243
${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"}
4344

4445
### @usage: TS_WEBPACK([name])

‎build/export_generators/cmake/dir_cmake_lists.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- include '[generator]/disclaimer.jinja' %}
2-
{% include 'prologue.cmake' ignore missing -%}
1+
{%- include '[generator]/disclaimer.jinja' -%}
2+
{%- include 'prologue.cmake' ignore missing -%}
33

44
{%- include "[generator]/dir_packages.jinja" -%}
55
{%- include "[generator]/dir_tools.jinja" -%}

‎build/export_generators/cmake/dir_includes.jinja

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{%- if dir_includes is defined %}
2-
{% for dir_include in dir_includes -%}
1+
{%- if dir_includes|length -%}
2+
{%- for dir_include in dir_includes %}
33
include({{ dir_include }})
4-
{% endfor -%}
5-
{%- endif -%}
4+
{% endfor %}
5+
{% endif -%}
66

7-
{%- if subdirs|length %}
8-
{% for subdir in subdirs -%}
7+
{%- if subdirs|length -%}
8+
{%- for subdir in subdirs %}
99
add_subdirectory({{ subdir }})
10-
{% endfor -%}
11-
{%- endif -%}
10+
{%- endfor %}
11+
{% endif -%}

0 commit comments

Comments
 (0)