From 74204b1af4f7f8a59c5a6c3c6f2eead7de38420a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Sun, 14 Aug 2022 13:29:52 +0800 Subject: [PATCH 1/6] Update install-common.sh --- utils/install-common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/install-common.sh b/utils/install-common.sh index c5b21a693..66ea29bf4 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -136,6 +136,7 @@ install_dashboard_dependencies_rpm() { curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" yum install -y nodejs yarn + curl -fsSL https://get.pnpm.io/install.sh | sh - install_golang } @@ -145,6 +146,7 @@ install_dashboard_dependencies_deb() { curl -fsSL https://deb.nodesource.com/setup_14.x | bash - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm install -g yarn + npm install -g pnpm install_golang } From 5d6495affc49eae5b5f582c5edb259103203fbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Sun, 14 Aug 2022 13:47:56 +0800 Subject: [PATCH 2/6] Update install-common.sh --- utils/install-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/install-common.sh b/utils/install-common.sh index 66ea29bf4..88b035bbb 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -136,7 +136,7 @@ install_dashboard_dependencies_rpm() { curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" yum install -y nodejs yarn - curl -fsSL https://get.pnpm.io/install.sh | sh - + npm install -g pnpm install_golang } From 9a279666cfda9dc8340f92e82bdcfa8b8dfaa28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Sun, 14 Aug 2022 13:53:53 +0800 Subject: [PATCH 3/6] Update install-common.sh --- utils/install-common.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/install-common.sh b/utils/install-common.sh index 88b035bbb..40d71d5f1 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -135,8 +135,7 @@ install_dashboard_dependencies_rpm() { yum install -y wget curl git which gcc make curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" - yum install -y nodejs yarn - npm install -g pnpm + yum install -y nodejs yarn pnpm install_golang } From 8eaf967b92c86f67af26beb000390be2f454e463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Sun, 14 Aug 2022 15:09:33 +0800 Subject: [PATCH 4/6] Update install-common.sh --- utils/install-common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/install-common.sh b/utils/install-common.sh index 40d71d5f1..af6f9e049 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -135,7 +135,9 @@ install_dashboard_dependencies_rpm() { yum install -y wget curl git which gcc make curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" - yum install -y nodejs yarn pnpm + yum install -y nodejs yarn + corepack enable + npm install -g pnpm install_golang } From 2223e556802ea0fc2bb871b503f9ff3b6a8a501c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Sun, 14 Aug 2022 15:22:55 +0800 Subject: [PATCH 5/6] Update install-common.sh --- utils/install-common.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/install-common.sh b/utils/install-common.sh index af6f9e049..88b035bbb 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -136,7 +136,6 @@ install_dashboard_dependencies_rpm() { curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" yum install -y nodejs yarn - corepack enable npm install -g pnpm install_golang } From 51120bc8c12a3ed38c08d1b9f6c1000b937e1a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=BF=E6=A3=AE?= <72308243+FangSen9000@users.noreply.github.com> Date: Wed, 24 Aug 2022 20:57:04 +0800 Subject: [PATCH 6/6] Update install-common.sh --- utils/install-common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/install-common.sh b/utils/install-common.sh index 88b035bbb..f8d574953 100755 --- a/utils/install-common.sh +++ b/utils/install-common.sh @@ -137,6 +137,7 @@ install_dashboard_dependencies_rpm() { sh -c "$(curl -fsSL https://rpm.nodesource.com/setup_14.x)" yum install -y nodejs yarn npm install -g pnpm + npm config set strict-peer-dependencies=false install_golang } @@ -147,6 +148,7 @@ install_dashboard_dependencies_deb() { DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm install -g yarn npm install -g pnpm + npm config set strict-peer-dependencies=false install_golang }