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..0c1f450754 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ 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/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 @@ -94,6 +97,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/ @@ -263,11 +267,31 @@ 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 - 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: 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 ------------------------------ // 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");