From c9f7798ea35f21db3e79f3ae5438538605d2772d Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 10:44:59 +0800 Subject: [PATCH 1/7] * Modify the makefile for gitlab ci. --- .gitlab-ci.yml | 3 ++- Makefile | 33 ++++++++++++++++++++++++++++----- tools/minifyfront.php | 6 ++++-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e2c7e65a1..f3633f45b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ sonarqube: key: "${CI_JOB_NAME}" paths: - .sonar/cache - script: + script: - sonar-scanner -Dsonar.inclusions=$(git diff --name-only HEAD~1|tr '\n' ',') allow_failure: true only: @@ -14,6 +14,7 @@ sonarqube: packages: script: - make cizip + allow_failure: true only: - merge_request - master diff --git a/Makefile b/Makefile index 35c16c05e1..48131d28ab 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,13 @@ VERSION = $(shell head -n 1 VERSION) -LITEVERSION = $(shell head -n 1 extension/lite/LITEVERSION) XUANVERSION = $(shell head -n 1 xuanxuan/XUANVERSION) XVERSION = $(shell head -n 1 xuanxuan/XVERSION) -XUANPATH := $(XUANXUAN_SRC_PATH) -BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) -RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) +#XUANPATH := $(XUANXUAN_SRC_PATH) +#BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) +#RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) +XUANPATH := /home/z/ci/gitlab/xuan/ +BUILD_PATH := /home/z/ci/build/ +RELEASE_PATH := /home/z/ci/release/ all: make clean @@ -263,7 +265,28 @@ ciCommon: cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) cp ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH) cizip: - make ciCommon + make common + + ifneq ($(XUANPATH), ) + make zentaoxx + cp zentaoxx/* zentaopms/ -r + rm -rf zentaoxx + endif + + make package + zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms + # en + cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g'; + cd zentaopms/; grep -rl 'http://www.zentao.pm'|xargs sed -i 's/http:\/\/www.zentao.pm/https:\/\/www.zentao.pm/g'; + cd zentaopms/config/; echo >> config.php; echo '$$config->isINT = true;' >> config.php + mv zentaopms zentaoalm + zip -r -9 ZenTaoALM.$(VERSION).int.zip zentaoalm + rm -fr zentaoalm + # move pms zip to build and release path. + rm -f $(BUILD_PATH)/ZenTao*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION).int.zip + cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) + cp ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH) + # make zip packages. php tools/packZip.php $(VERSION) sh zip.sh rm -rf tmp/ *.sh diff --git a/tools/minifyfront.php b/tools/minifyfront.php index 20a6f75b29..4809b6daab 100644 --- a/tools/minifyfront.php +++ b/tools/minifyfront.php @@ -4,8 +4,10 @@ */ $baseDir = dirname(dirname(__FILE__)); -$miniCSSTool = getenv('MINIFY_CSS_PATH'); -$miniJSTool = getenv('MINIFY_JS_PATH'); +//$miniCSSTool = getenv('MINIFY_CSS_PATH'); +//$miniJSTool = getenv('MINIFY_JS_PATH'); +$miniCSSTool = '/home/z/ci/minify/minifyCSS.php'; +$miniJSTool = '/home/z/ci/minify/minifyJS.php'; //--------------------------------- PROCESS JS FILES ------------------------------ // From 2ef3df34b438f126e79b48f6fe4e2560f6e546f9 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 10:51:05 +0800 Subject: [PATCH 2/7] * Remove the git pull command for gitlab ci. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48131d28ab..6665549aa7 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,8 @@ zentaoxx: mkdir -p zentaoxx/db mkdir -p zentaoxx/www mkdir -p zentaoxx/extension/xuan/common/ext/model/ - cd $(XUANPATH); git pull; git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip + #cd $(XUANPATH); git pull; git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip + cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip mv $(XUANPATH)/xuan.zip . unzip xuan.zip cp xuan/xxb/config/ext/_0_xuanxuan.php zentaoxx/config/ext/ From ca6eb3fcc5fc01ec8c06adb6aec6206b5bec54e3 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 12:33:38 +0800 Subject: [PATCH 3/7] * Simplified code. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6665549aa7..18e82b8d02 100644 --- a/Makefile +++ b/Makefile @@ -290,8 +290,7 @@ cizip: # make zip packages. php tools/packZip.php $(VERSION) sh zip.sh - rm -rf tmp/ *.sh - rm -rf zentaobiz* zentaomax* $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/pmsPack/*.zip + rm -rf tmp/ *.sh zentaobiz* zentaomax* $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/pmsPack/*.zip mv ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH) mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack ci: From 50877d82a94f07459e85bf4f455619f353001cac Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 13:39:29 +0800 Subject: [PATCH 4/7] * Change the xuan repo path to /home/gitlab-runner. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18e82b8d02..feee44340a 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ XVERSION = $(shell head -n 1 xuanxuan/XVERSION) #XUANPATH := $(XUANXUAN_SRC_PATH) #BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) #RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) -XUANPATH := /home/z/ci/gitlab/xuan/ +XUANPATH := /home/gitlab-runner/ci/gitlab/xuan/ BUILD_PATH := /home/z/ci/build/ RELEASE_PATH := /home/z/ci/release/ From ffffeeb6ecb6f3bfd82de85f1f35ad66457f3a6f Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 13:46:05 +0800 Subject: [PATCH 5/7] * Temporarily fix environment variables for gitlab ci. --- tools/packZip.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packZip.php b/tools/packZip.php index 9e226040e5..16cf9f6527 100644 --- a/tools/packZip.php +++ b/tools/packZip.php @@ -6,7 +6,8 @@ $liteVersion = isset($argv[2]) ? $argv[2] : ''; /* File pathes. */ $basePath = dirname(dirname(__FILE__)); -$releasePath = getenv('ZENTAO_RELEASE_PATH'); +//$releasePath = getenv('ZENTAO_RELEASE_PATH'); +$releasePath = '/home/z/ci/release/'; $releasePath = !empty($releasePath) ? $releasePath : $basePath; if(!file_exists($releasePath . '/zentaopms.zip')) die("Please give me encrypted packages.\n"); From ad41c6279764dcdbcc13577b17844813e0223f22 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 14:13:37 +0800 Subject: [PATCH 6/7] * Add the xuanxuan web. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index feee44340a..56964cc12b 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,10 @@ XVERSION = $(shell head -n 1 xuanxuan/XVERSION) #XUANPATH := $(XUANXUAN_SRC_PATH) #BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) #RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) -XUANPATH := /home/gitlab-runner/ci/gitlab/xuan/ -BUILD_PATH := /home/z/ci/build/ -RELEASE_PATH := /home/z/ci/release/ +XUANPATH := /home/gitlab-runner/ci/gitlab/xuan/ +XUAN_WEB_PATH := /home/gitlab-runner/ci/packages/web +BUILD_PATH := /home/z/ci/build/ +RELEASE_PATH := /home/z/ci/release/ all: make clean @@ -97,6 +98,7 @@ zentaoxx: cp -r xuanxuan/config/* zentaoxx/config/ cp -r xuanxuan/extension/xuan/* zentaoxx/extension/xuan/ cp -r xuanxuan/www/* zentaoxx/www/ + cp -r $(XUAN_WEB_PATH) zentaoxx/www/data/xuanxuan/ mv zentaoxx/db/ zentaoxx/db_bak mkdir zentaoxx/db/ cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/ From c5aa828a093d6810da4e0bf5f791a513e0f3065b Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Jun 2022 14:21:56 +0800 Subject: [PATCH 7/7] * Add the git pull command. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 56964cc12b..0c1f450754 100644 --- a/Makefile +++ b/Makefile @@ -70,8 +70,7 @@ zentaoxx: mkdir -p zentaoxx/db mkdir -p zentaoxx/www mkdir -p zentaoxx/extension/xuan/common/ext/model/ - #cd $(XUANPATH); git pull; git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip - cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip + cd $(XUANPATH); git pull; git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip mv $(XUANPATH)/xuan.zip . unzip xuan.zip cp xuan/xxb/config/ext/_0_xuanxuan.php zentaoxx/config/ext/