From 15860b087c3419bcf61d0330a6eb59add6f4cb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=20=E6=98=8A?= <gaohao@geedgenetworks.com>
Date: Mon, 13 Jun 2022 08:47:51 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20NEZ-1909=20=E5=BF=AB=E7=85=A7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=87=AA=E5=8A=A8=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2edc610c2..d371fd83b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,11 +37,14 @@ dev_build:
     - echo "npm install ..."
     - npm install --registry=http://registry.npmmirror.com
     - echo "npm run build"
-    - npm run build
-
-    - cd /builds/nezha/nezha-fronted/nezha-fronted/dist 
-    # 链接 minio 引入模板
+    
+    # 编译 上传模板
+    - npm run build:html
     - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
+    - mc cp dist/index.html nz/depends/template/snapshot_template.html
+
+    - npm run build
+    - cd /builds/nezha/nezha-fronted/nezha-fronted/dist 
     - mc cp nz/depends/template/snapshot_template.html ./snapshot_template.html
     - rm -rf nz-gui*.zip
     - export FILE_NAME=nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.zip
@@ -80,9 +83,13 @@ rel_build:
     - cd nezha-fronted
     - 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
+    - mc cp dist/index.html nz/depends/template/snapshot_template.html
+
     - npm run build
     - cd /builds/nezha/nezha-fronted/nezha-fronted/dist
-    - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
     - mc cp nz/depends/template/snapshot_template.html ./snapshot_template.html
     - zip -m nz-gui*.zip ./snapshot_template.html
     - mv nz-gui*.zip nz-gui-$CI_COMMIT_SHORT_SHA.zip