From 5b472e28ebf370d63b11732c7b3c8aa9415b430c Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Tue, 24 Mar 2020 11:45:13 -0100 Subject: [PATCH] mgr/dashboard: Update Node.js to latest LTS: v12.16.2 Signed-off-by: Tiago Melo --- make-dist | 4 ++-- src/pybind/mgr/dashboard/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make-dist b/make-dist index 5ec42228712ef..7802cb726d1f4 100755 --- a/make-dist +++ b/make-dist @@ -74,7 +74,7 @@ build_dashboard_frontend() { $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR $TEMP_DIR/bin/pip install nodeenv - $TEMP_DIR/bin/nodeenv -p --node=10.18.1 + $TEMP_DIR/bin/nodeenv -p --node=12.16.2 cd src/pybind/mgr/dashboard/frontend DEFAULT_LANG=`jq -r .config.locale package.json` @@ -97,7 +97,7 @@ build_dashboard_frontend() { [ -z "$MAX_DASHBOARD_PARALLEL_BUILDS" ] && MAX_DASHBOARD_PARALLEL_BUILDS=1 . $TEMP_DIR/bin/activate - NG_CLI_ANALYTICS="false" timeout 1h npm ci + timeout 1h npm ci echo "Building ceph-dashboard frontend with build${BUILD_TARGET} script"; # we need to use "-- --" because so that "--prod" survives accross all # scripts redirections inside package.json diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt index 104b2a1846f5e..6db50f3ab0e39 100644 --- a/src/pybind/mgr/dashboard/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/CMakeLists.txt @@ -32,7 +32,7 @@ else() OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv - COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.18.1 + COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=12.16.2 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "dashboard nodeenv is being installed" ) @@ -49,7 +49,7 @@ endif() add_npm_command( OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" - COMMAND NG_CLI_ANALYTICS=false CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress npm ci + COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress npm ci DEPENDS frontend/package.json WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend COMMENT "dashboard frontend dependencies are being installed" -- 2.39.5