diff --git a/Makefile b/Makefile index 46a0f9054b..64598386ea 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ VERSION = $(shell head -n 1 VERSION) XUANVERSION = $(shell jq -r .pkg.xuanxuan.gitVersion < ci.json) XVERSION = $(shell jq -r .pkg.xuanxuan.version < ci.json) +SUITEVERSION = $(shell jq -r .pkg.blocksuite.version < ci.json) XHPROF_VERSION = 2.3.9 XUANPATH := $(XUANXUAN_SRC_PATH) @@ -8,6 +9,7 @@ BUILD_KIND := $(if $(BUILD_KIND),$(BUILD_KIND),auto) BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) XUAN_WEB_PATH := $(ZENTAO_BUILD_PATH)/web +GITFOX_HOST := https://$(GITFOX_HOST) all: make clean @@ -28,6 +30,8 @@ clean: rm -f *.sh rm -f *.deb *.rpm common: + curl $(GITFOX_HOST)/_artifacts/zentao/raw/zui3/static/blocksuite/$(SUITEVERSION)/blocksuite-$(SUITEVERSION).tar.gz | tar zxf - -C www/js/zui3/editor/ + mkdir zentaopms cp -fr api zentaopms/ cp -fr bin zentaopms/ diff --git a/ci.json b/ci.json index a70fb1b4c4..255a6f904b 100644 --- a/ci.json +++ b/ci.json @@ -15,6 +15,9 @@ }, "downgradeExt": { "gitRepo": "ci/zentaoext-downgrade" + }, + "blocksuite": { + "version": "0.17.10" } }, "image": {