From cc1563afe67d567e6e7c007a0ee6ee2ad011feaa Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 11 Jul 2022 17:25:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 19 +++++++++++++++++++ public/config.js | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdc080aa..42795ee5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ # 自定义生命周期 stages: + - gen_git-log - build_project - build_image @@ -14,6 +15,24 @@ cache: before_script: - export CNUI_TAG=$(date +%Y%m%d%H%M%S) +generate_git-log: + stage: gen_git-log + script: + - if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i 's++更新记录\n+g' ./public/index.html; echo "添加更新记录链接"; fi; + - echo "最近的100个提交记录" + - echo "
" > ./public/git-log.html
+    - "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
+    - echo "
" >> ./public/git-log.html + - echo "处理 git-log.html 结束" + artifacts: + paths: + - public/index.html + - public/git-log.html + only: + - dev + tags: + - GN-XXG-Server + build_project: stage: build_project script: diff --git a/public/config.js b/public/config.js index e672dcd8..3d59b49f 100644 --- a/public/config.js +++ b/public/config.js @@ -1,4 +1,4 @@ var BASE_CONFIG = { - baseUrl: 'http://192.168.44.53:8090/', + baseUrl: 'http://192.168.44.54:8090/', version: '2.0.2021.05.11.19.43' }