summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuai <[email protected]>2022-09-20 18:00:09 +0800
committerzhangshuai <[email protected]>2022-09-20 18:00:09 +0800
commit4a0ca2ef92bf36ea6584513a252191b3493c1c4f (patch)
tree9773260f17463d79b0be307671ac202952092326
parentd571a567e2b37948d56ee3211945e8eeaa4a252a (diff)
fix: 修改版本信息rel-22.10.01rel-22.07.09
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13e3b71..5050665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,9 @@ dev_build:
- env | sort
- pwd
- export FILE_NAME=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.tar.gz
- - echo -e "version=${PACKAGE_VERSION}\ncommit=$CI_COMMIT_SHORT_SHA\nbuildDate=`date +'%Y%m%d%H%m%S'`" >>./src/main/resources/version.properties
+ - export BRANCH_ARRAY=(${CI_COMMIT_REF_NAME//-/ })
+ - export PACKAGE_VERSION=${BRANCH_ARRAY[1]}.$CI_COMMIT_SHORT_SHA
+ - echo -e "version=$PACKAGE_VERSION\ncommit=$CI_COMMIT_SHORT_SHA\nbuildDate=`date +'%Y%m%d%H%m%S'`" >>./src/main/resources/version.properties
- mvn clean install -Dxjar.password=2q667Gykpr36Thcjf4JK -Dxjar.excludes=/db/*,/static/**/*
- cd ./target && go build xjar.go && tar -zcvf $FILE_NAME xjar nz-agent.xjar
# 上传minio