From e6453057131d29c77199903086f182d0e85d89dc Mon Sep 17 00:00:00 2001
From: zhangshuai
Date: Wed, 16 Nov 2022 11:27:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9Fci=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 738677a27..e39d60a85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,16 +38,10 @@ dev_build:
- npm install --registry=http://registry.npmmirror.com
- echo "npm run build"
+ # 编译 上传模板
+ - npm run build:html
- mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
- # 根据提交信息，判断本次是否 编译上传模板
- - >
- if [[ $CI_COMMIT_MESSAGE =~ "snapshotTemplate" ]]; then
- echo "Update snapshot template ..."
- npm run build:html
- mc cp dist/index.html nz/depends/template/snapshot_template.html
- else
- echo "No need to update snapshot template"
- fi
+ - mc cp dist/index.html nz/depends/template/snapshot_template.html
- npm run build
- cd /builds/nezha/nezha-fronted/nezha-fronted/dist
@@ -56,7 +50,13 @@ dev_build:
- export FILE_NAME=nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.zip
# 生成 git log 日志文件
- sed -i 's++更新记录\n+g' ./index.html;
+ # echo "" > ./static/git-log.html
+ # echo " " >> ./static/git-log.html
+ # echo '' >> ./static/git-log.html
+ # echo "" >> ./static/git-log.html
+ # echo "" >> ./static/git-log.html
- "git log -100 --pretty=format:'%ad : %s' >> ./static/git-log.log"
+ # echo "