From aba88d0c6ee5dc027412d3b435cff7805d731be1 Mon Sep 17 00:00:00 2001
From: Jialei <jialeicui@126.com>
Date: Wed, 11 Jan 2023 11:41:09 +0800
Subject: [PATCH] fix(e2e): fix console building issue

---
 console/Makefile       | 15 +++++++++++----
 scripts/publish/pub.sh |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/console/Makefile b/console/Makefile
index fa3f1e6476..e18df13d32 100644
--- a/console/Makefile
+++ b/console/Makefile
@@ -1,19 +1,26 @@
-install-yarn:
-	npm install -g yarn
+.PHONY: *
+
+install-dev-tools:
+	npm install -g yarn pnpm
+
 install-dependencies:
 	yarn
+
 build-ui:
 	yarn build
+
 ci-lint:
 	yarn lint
 	yarn typecheck
 
 rebuild-gradio:
 	rm -rf gradio && git clone --depth 1 --branch=feat/sw-gradio-widget https://github.com/star-whale/gradio gradio	
-	pushd gradio/ui && \
+	cd gradio/ui && \
 		pnpm i && \
 		pnpm build && \
+		cd ../.. && \
 		rm -rf src/assets/GradioWidget && mkdir -p src/assets/GradioWidget && \
-		mv packages/starwhale/build src/assets/GradioWidget/es && popd
+		mv gradio/ui/packages/starwhale/build src/assets/GradioWidget/es
 	rm -rf gradio
 
+build-all: install-dependencies rebuild-gradio build-ui
diff --git a/scripts/publish/pub.sh b/scripts/publish/pub.sh
index 89c4a8f06d..881af99204 100644
--- a/scripts/publish/pub.sh
+++ b/scripts/publish/pub.sh
@@ -57,7 +57,7 @@ build() {
         popd
     else
         pushd ../../console
-        yarn && yarn build
+        make install-dev-tools && make build-all
         popd
     fi
     b_controller