aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspreis <spreis@yandex-team.com>2024-07-13 14:11:01 +0300
committerspreis <spreis@yandex-team.com>2024-07-13 14:23:08 +0300
commitd3d76f92c714b9c76ed5e646b377a861fa6570a5 (patch)
tree5e5d5f57df679bae1e55b3171f313ed1578fc36c
parent7fa6e8fc2355ab3dea321089c1fb973928e12892 (diff)
downloadydb-d3d76f92c714b9c76ed5e646b377a861fa6570a5.tar.gz
Simplify CI_GROUP command to avoid having massive results + use package scripts from python3
This avoids having CI_GROUP as PACKAGE to avoid having as result everything it PEERDIRS and contains. Its PEERDIRs still be built and cached, but won't become single massive result. Though if UNION or PACKAGE is PEERDIRed they will be preserved in autocheck grah and will be cached as denedency, but not as result. 66f802e32b35570fd095d4ab1963eb579d7449ee
-rw-r--r--build/ymake.core.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 729a795ffb..9cbf6efac1 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2450,7 +2450,7 @@ multimodule PACKAGE {
}
}
-TOUCH_GROUP=$TOUCH_PACKAGE ${hide;kv:"p CI"}
+TOUCH_GROUP=$FAKE_PACKAGE_CMD $VCS_INFO_DISABLE_CACHE__NO_UID__ ${hide:PEERS} ${hide:AUTO_INPUT} ${hide:SRCS_GLOBAL} ${hide;kv:"p CI"} ${hide;kv:"package PACKAGE"}
### @usage: CI_GROUP()
###
@@ -4878,9 +4878,9 @@ macro TOUCH(Outputs...) {
.CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output:Outputs}
}
-TOUCH_UNIT=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${hide;kv:"p UN"} ${hide;kv:"pc light-cyan"} $TARGET
-FAKE_PACKAGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${hide;kv:"pc light-red"} $TARGET
-COPY_PACKAGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/copy_to_dir.py"} --dest-dir $BINDIR --build-root $ARCADIA_BUILD_ROOT $PACKED_PACKAGE_ARGS $SRCS_GLOBAL $PEERS_LATE_OUTS ${skip_by_ext=.pkg.fake:PEERS} ${hide;late_out:AUTO_INPUT} ${hide;late_out;to_namespace=$BINDIR/:SRCS_GLOBAL} ${hide;late_out;to_namespace=$BINDIR/:PEERS_LATE_OUTS} ${hide;late_out;skip_by_ext=.pkg.fake;to_namespace=$BINDIR/:PEERS} ${hide;kv:"package PACKAGE"}
+TOUCH_UNIT=$YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} ${hide;kv:"p UN"} ${hide;kv:"pc light-cyan"} $TARGET
+FAKE_PACKAGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} ${hide;kv:"pc light-red"} $TARGET
+COPY_PACKAGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/copy_to_dir.py"} --dest-dir $BINDIR --build-root $ARCADIA_BUILD_ROOT $PACKED_PACKAGE_ARGS $SRCS_GLOBAL $PEERS_LATE_OUTS ${skip_by_ext=.pkg.fake:PEERS} ${hide;late_out:AUTO_INPUT} ${hide;late_out;to_namespace=$BINDIR/:SRCS_GLOBAL} ${hide;late_out;to_namespace=$BINDIR/:PEERS_LATE_OUTS} ${hide;late_out;skip_by_ext=.pkg.fake;to_namespace=$BINDIR/:PEERS} ${hide;kv:"package PACKAGE"}
TOUCH_PACKAGE=$FAKE_PACKAGE_CMD $VCS_INFO_DISABLE_CACHE__NO_UID__ && $COPY_PACKAGE_CMD
_P_PK=${hide;kv:"p PK"}
TOUCH_PACKAGE_MF=$GENERATE_MF && $TOUCH_PACKAGE $_P_PK && $ADD_VCS_INFO_FILE_CMD