diff options
| author | vturov <vturov@yandex-team.com> | 2024-05-03 12:02:05 +0300 |
|---|---|---|
| committer | vturov <vturov@yandex-team.com> | 2024-05-03 12:13:05 +0300 |
| commit | e29d55caf8ec9fd8d8a8375766d6f71860cc1355 (patch) | |
| tree | a4841d3e16497dfa6f67ffbb923f9dd3e9e5d19c | |
| parent | c5c2eecd591ae69a2130671a8a9bfaa43d01089f (diff) | |
| download | ydb-e29d55caf8ec9fd8d8a8375766d6f71860cc1355.tar.gz | |
использовать EslintNewTestSuite
38492359bcf6831eaf3a0003363e44f8ee70c19b
| -rw-r--r-- | build/conf/ts/ts_test.conf | 2 | ||||
| -rw-r--r-- | build/plugins/lib/nots/package_manager/pnpm/package_manager.py | 4 | ||||
| -rw-r--r-- | build/plugins/nots.py | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf index a940cafa66..e9dcd799b8 100644 --- a/build/conf/ts/ts_test.conf +++ b/build/conf/ts/ts_test.conf @@ -146,7 +146,7 @@ macro _SETUP_EXTRACT_OUTPUT_TARS_RECIPE(FOR_PATH) { } macro _SETUP_INSTALL_NODE_MODULES_RECIPE() { - USE_RECIPE(devtools/frontend_build_platform/nots/recipes/install_node_modules/recipe $NOTS_TOOL_BASE_ARGS) + USE_RECIPE(devtools/frontend_build_platform/nots/recipes/install_node_modules/recipe $NOTS_TOOL_BASE_ARGS --bundle no) } diff --git a/build/plugins/lib/nots/package_manager/pnpm/package_manager.py b/build/plugins/lib/nots/package_manager/pnpm/package_manager.py index 4a42093fff..da70be303f 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/package_manager.py +++ b/build/plugins/lib/nots/package_manager/pnpm/package_manager.py @@ -37,7 +37,7 @@ class PnpmPackageManager(BasePackageManager): def get_local_pnpm_store(): return os.path.join(home_dir(), ".cache", "pnpm-store") - def create_node_modules(self, yatool_prebuilder_path=None, local_cli=False): + def create_node_modules(self, yatool_prebuilder_path=None, local_cli=False, bundle=True): """ Creates node_modules directory according to the lockfile. """ @@ -77,7 +77,7 @@ class PnpmPackageManager(BasePackageManager): self._run_apply_addons_if_need(yatool_prebuilder_path, virtual_store_dir) self._replace_internal_lockfile_with_original(virtual_store_dir) - if not local_cli: + if not local_cli and bundle: bundle_node_modules( build_root=self.build_root, node_modules_path=self._nm_path(), diff --git a/build/plugins/nots.py b/build/plugins/nots.py index b69b65d215..9a95643ba0 100644 --- a/build/plugins/nots.py +++ b/build/plugins/nots.py @@ -373,11 +373,12 @@ def _setup_eslint(unit): if not lint_files: return + mod_dir = unit.get("MODDIR") + unit.on_peerdir_ts_resource("eslint") user_recipes = unit.get("TEST_RECIPES_VALUE") - unit.on_setup_extract_node_modules_recipe(unit.get("MODDIR")) + unit.on_setup_install_node_modules_recipe() - mod_dir = unit.get("MODDIR") lint_files = _resolve_module_files(unit, mod_dir, lint_files) deps = _create_pm(unit).get_peers_from_package_json() test_record = { @@ -385,7 +386,7 @@ def _setup_eslint(unit): "LINT-FILE-PROCESSING-TIME": str(ESLINT_FILE_PROCESSING_TIME_DEFAULT), } - _add_test(unit, "eslint", lint_files, deps, test_record, mod_dir) + _add_test(unit, "eslint.new", lint_files, deps, test_record, mod_dir) unit.set(["TEST_RECIPES_VALUE", user_recipes]) @@ -461,7 +462,7 @@ def _add_test(unit, test_type, test_files, deps=None, test_record=None, test_cwd # Key to discover suite (see devtools/ya/test/explore/__init__.py#gen_suite) "SCRIPT-REL-PATH": test_type, # Test name as shown in PR check, should be unique inside one module - "TEST-NAME": test_type.lower(), + "TEST-NAME": test_type.lower().replace(".new", ""), "TEST-TIMEOUT": unit.get("TEST_TIMEOUT") or "", "TEST-ENV": ytest.prepare_env(unit.get("TEST_ENV_VALUE")), "TESTED-PROJECT-NAME": os.path.splitext(unit.filename())[0], |