From 5f95db33e912ca2b4a8a9d265d8cb537a6ceab03 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Wed, 19 Oct 2022 13:34:58 +0530 Subject: [PATCH] cmake: bump node version to 14 to update the angular to 13, we need a node version of either 12.20.x or 14.15.x or 16.10.x. But inorder to not break the angular 12 run for now we need to choose the node which works for both 12 and 13. which is 14.15.x. So I went with that node version here. Signed-off-by: Nizamudeen A --- doc/dev/developer_guide/dash-devel.rst | 4 ++-- make-dist | 2 +- src/pybind/mgr/dashboard/frontend/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/dev/developer_guide/dash-devel.rst b/doc/dev/developer_guide/dash-devel.rst index cc158d7a3fc..262aa091f91 100644 --- a/doc/dev/developer_guide/dash-devel.rst +++ b/doc/dev/developer_guide/dash-devel.rst @@ -215,8 +215,8 @@ The build process is based on `Node.js `_ and requires the Prerequisites ~~~~~~~~~~~~~ - * Node 12.18.2 or higher - * NPM 6.13.4 or higher + * Node 14.15.0 or higher + * NPM 6.14.9 or higher nodeenv: During Ceph's build we create a virtualenv with ``node`` and ``npm`` diff --git a/make-dist b/make-dist index 2fe9c8d3e4a..f2626871534 100755 --- a/make-dist +++ b/make-dist @@ -132,7 +132,7 @@ build_dashboard_frontend() { $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR $TEMP_DIR/bin/pip install nodeenv - $TEMP_DIR/bin/nodeenv --verbose -p --node=12.18.2 + $TEMP_DIR/bin/nodeenv --verbose -p --node=14.15.1 cd src/pybind/mgr/dashboard/frontend . $TEMP_DIR/bin/activate diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt index f92c34791c0..f34cde6fb61 100644 --- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt @@ -63,7 +63,7 @@ else(WITH_SYSTEM_NPM) 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 --verbose ${node_mirror_opt} -p --node=12.18.2 + COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1 COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "dashboard nodeenv is being installed") -- 2.39.5