blob: 797251b8a2573a5e92f92be08c3ed7cbd23e66e3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
diff -Nurp a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
--- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt 2023-10-24 11:56:46.686189574 +0000
+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt 2023-10-24 12:01:01.169464299 +0000
@@ -83,7 +83,7 @@ endif(WITH_SYSTEM_NPM)
add_npm_command(
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
- COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci -f ${mgr-dashboard-userconfig}
+ COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false yarn install --network-timeout 600000 --frozen-lockfile ${mgr-dashboard-userconfig}
DEPENDS package.json
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "dashboard frontend dependencies are being installed"
@@ -116,7 +116,7 @@ endif()
add_npm_command(
OUTPUT "${frontend_dist_dir}"
- COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" npm run build:localize -- ${npm_args}
+ COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" yarn run build:localize ${npm_args}
DEPENDS ${frontend_src} node_modules
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "dashboard frontend is being created"
|
