]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/dashboard: Prevent angular of getting stuck during installation
authorTiago Melo <tmelo@suse.com>
Tue, 27 Aug 2019 10:37:30 +0000 (10:37 +0000)
committerTiago Melo <tmelo@suse.com>
Tue, 3 Sep 2019 14:44:00 +0000 (14:44 +0000)
During npm packages installation Angular was getting stuck waiting for input.
Using "NG_CLI_ANALYTICS=false" will prevent that,

Signed-off-by: Tiago Melo <tmelo@suse.com>
src/pybind/mgr/dashboard/CMakeLists.txt

index 03c4b4b57148093b9b2d8a341938ebce69c700fd..31a1760263f25404ee21d790bc7bde0990ff7796 100644 (file)
@@ -6,7 +6,7 @@ function(add_npm_command)
   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
   string(REPLACE ";" " " command "${NC_COMMAND}")
   if(NC_NODEENV)
-    string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
+    string(REGEX REPLACE "^(.*npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
   endif()
   string(REPLACE " " ";" command "${command}")
   add_custom_command(
@@ -50,7 +50,7 @@ endif()
 
 add_npm_command(
   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
-  COMMAND npm ci
+  COMMAND NG_CLI_ANALYTICS=false npm ci
   DEPENDS frontend/package.json
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
   COMMENT "dashboard frontend dependencies are being installed"